diff options
| author | Robert Adams | 2013-11-24 07:23:12 -0800 |
|---|---|---|
| committer | Robert Adams | 2013-11-24 07:23:12 -0800 |
| commit | 3193bcaae1cbe86d22c4ade5c79d5e25d11a59da (patch) | |
| tree | c96b96a7302f5323df63f6255e528de68ab67c6f /.gitignore | |
| parent | Merge branch 'master' into varregion (diff) | |
| parent | Revert "Fix issue where sitting on non-root linked prims would send camera to... (diff) | |
| download | opensim-SC-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.zip opensim-SC-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.gz opensim-SC-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.bz2 opensim-SC-3193bcaae1cbe86d22c4ade5c79d5e25d11a59da.tar.xz | |
Merge branch 'master' into varregion
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 7 |
1 files changed, 6 insertions, 1 deletions
| @@ -10,6 +10,12 @@ | |||
| 10 | *.pidb | 10 | *.pidb |
| 11 | *.dll.build | 11 | *.dll.build |
| 12 | *.dll | 12 | *.dll |
| 13 | |||
| 14 | # Ignore .user and .suo files as these are user preference specific | ||
| 15 | # http://stackoverflow.com/questions/72298/should-i-add-the-visual-studio-suo-and-user-files-to-source-control | ||
| 16 | *.suo | ||
| 17 | *.user | ||
| 18 | |||
| 13 | *.VisualState.xml | 19 | *.VisualState.xml |
| 14 | */*/obj | 20 | */*/obj |
| 15 | */*/*/obj | 21 | */*/*/obj |
| @@ -65,7 +71,6 @@ bin/crashes/ | |||
| 65 | Examples/*.dll | 71 | Examples/*.dll |
| 66 | OpenSim.build | 72 | OpenSim.build |
| 67 | OpenSim.sln | 73 | OpenSim.sln |
| 68 | OpenSim.suo | ||
| 69 | OpenSim.userprefs | 74 | OpenSim.userprefs |
| 70 | Prebuild/Prebuild.build | 75 | Prebuild/Prebuild.build |
| 71 | Prebuild/Prebuild.sln | 76 | Prebuild/Prebuild.sln |