diff options
| author | Robert Adams | 2014-01-26 07:56:47 -0800 |
|---|---|---|
| committer | Robert Adams | 2014-01-26 07:56:47 -0800 |
| commit | 13a9d5409cdb14a66e88883fe2287b51554f3b88 (patch) | |
| tree | a1f40f332400dd900f432f26ee34fabb317bde5c /OpenSim/Framework/MapBlockData.cs | |
| parent | varregion: modify MapImageModule structure so it will better merge (diff) | |
| parent | Merge branch 'justincc-master' (diff) | |
| download | opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.zip opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.tar.gz opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.tar.bz2 opensim-SC_OLD-13a9d5409cdb14a66e88883fe2287b51554f3b88.tar.xz | |
Merge branch 'master' into varregion
Conflicts:
OpenSim/Region/CoreModules/World/LegacyMap/MapImageModule.cs
OpenSim/Region/CoreModules/World/LegacyMap/ShadedMapTileRenderer.cs
OpenSim/Region/CoreModules/World/LegacyMap/TexturedMapTileRenderer.cs
Diffstat (limited to 'OpenSim/Framework/MapBlockData.cs')
0 files changed, 0 insertions, 0 deletions