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 /.gitignore | |
| parent | Revert "made setting rotation match Second Life" (diff) | |
| parent | Move addin attributes to RegionCombinerModule.addin.xml (diff) | |
| download | opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.zip opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.gz opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.bz2 opensim-SC_OLD-924df14c5e15185e14c144164dd80d9859d5c583.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
OpenSim/Capabilities/Handlers/GetTexture/GetTextureHandler.cs
OpenSim/Framework/Servers/VersionInfo.cs
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
| @@ -69,6 +69,7 @@ Examples/*.dll | |||
| 69 | OpenSim.build | 69 | OpenSim.build |
| 70 | OpenSim.sln | 70 | OpenSim.sln |
| 71 | OpenSim.suo | 71 | OpenSim.suo |
| 72 | OpenSim.userprefs | ||
| 72 | Prebuild/Prebuild.build | 73 | Prebuild/Prebuild.build |
| 73 | Prebuild/Prebuild.sln | 74 | Prebuild/Prebuild.sln |
| 74 | TestResult.xml | 75 | TestResult.xml |