diff options
| author | Melanie | 2013-11-23 19:13:22 +0000 |
|---|---|---|
| committer | Melanie | 2013-11-23 19:13:22 +0000 |
| commit | 3589acdab1721ee7d227a23dbeb2ccf91cbcb996 (patch) | |
| tree | a833014a1fedd774e7a9a01cd89a7edddb4210ba /.gitignore | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.zip opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.gz opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.bz2 opensim-SC-3589acdab1721ee7d227a23dbeb2ccf91cbcb996.tar.xz | |
Merge branch 'master' into careminster
Conflicts:
.gitignore
OpenSim/Region/CoreModules/Scripting/HttpRequest/ScriptsHttpRequests.cs
OpenSim/Region/CoreModules/World/Land/LandManagementModule.cs
prebuild.xml
runprebuild.bat
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 6 insertions, 1 deletions
| @@ -12,6 +12,12 @@ | |||
| 12 | *.dll.build | 12 | *.dll.build |
| 13 | *.dll | 13 | *.dll |
| 14 | *.log | 14 | *.log |
| 15 | |||
| 16 | # Ignore .user and .suo files as these are user preference specific | ||
| 17 | # http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control | ||
| 18 | *.suo | ||
| 19 | *.user | ||
| 20 | |||
| 15 | *.VisualState.xml | 21 | *.VisualState.xml |
| 16 | */*/obj | 22 | */*/obj |
| 17 | */*/*/obj | 23 | */*/*/obj |
| @@ -68,7 +74,6 @@ bin/crashes/ | |||
| 68 | Examples/*.dll | 74 | Examples/*.dll |
| 69 | OpenSim.build | 75 | OpenSim.build |
| 70 | OpenSim.sln | 76 | OpenSim.sln |
| 71 | OpenSim.suo | ||
| 72 | OpenSim.userprefs | 77 | OpenSim.userprefs |
| 73 | Prebuild/Prebuild.build | 78 | Prebuild/Prebuild.build |
| 74 | Prebuild/Prebuild.sln | 79 | Prebuild/Prebuild.sln |