diff options
| author | Melanie | 2012-09-07 19:49:46 +0100 |
|---|---|---|
| committer | Melanie | 2012-09-07 19:49:46 +0100 |
| commit | 924df14c5e15185e14c144164dd80d9859d5c583 (patch) | |
| tree | 110f0e402b879f49943ff2e76598e2241e20057c /OpenSim/Region/OptionalModules/Resources | |
| parent | Revert "made setting rotation match Second Life" (diff) | |
| parent | Move addin attributes to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to 'OpenSim/Region/OptionalModules/Resources')
0 files changed, 0 insertions, 0 deletions