diff options
| author | Melanie | 2012-01-30 16:38:11 +0000 |
|---|---|---|
| committer | Melanie | 2012-01-30 16:38:11 +0000 |
| commit | 1b600e7803a317e722b172c2a3481fc4d24ddc6c (patch) | |
| tree | 227712e3dd9df46b82edaf3e325af4c0a1ca9763 /OpenSim/Region/Application/OpenSimBase.cs | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Add ParcelImageID to RegionSettings so we can have that overlay. (diff) | |
| download | opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.zip opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.gz opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.bz2 opensim-SC_OLD-1b600e7803a317e722b172c2a3481fc4d24ddc6c.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Data/MySQL/MySQLSimulationData.cs
Diffstat (limited to 'OpenSim/Region/Application/OpenSimBase.cs')
0 files changed, 0 insertions, 0 deletions