diff options
author | Sean Dague | 2008-10-14 19:00:43 +0000 |
---|---|---|
committer | Sean Dague | 2008-10-14 19:00:43 +0000 |
commit | a27352010a0d0ae13b5beeac0132474e3ca6ac03 (patch) | |
tree | 74cf66a9e34b8ca6353e4b18ecd818e903fa21bd /.gitignore | |
parent | * minor: change m_debug to m_debugPacketLevel since that's what it is (diff) | |
download | opensim-SC_OLD-a27352010a0d0ae13b5beeac0132474e3ca6ac03.zip opensim-SC_OLD-a27352010a0d0ae13b5beeac0132474e3ca6ac03.tar.gz opensim-SC_OLD-a27352010a0d0ae13b5beeac0132474e3ca6ac03.tar.bz2 opensim-SC_OLD-a27352010a0d0ae13b5beeac0132474e3ca6ac03.tar.xz |
Merge commit 'arthur/master'
Diffstat (limited to '')
-rw-r--r-- | .gitignore | 6 |
1 files changed, 6 insertions, 0 deletions
@@ -1,3 +1,5 @@ | |||
1 | .project | ||
2 | .settings | ||
1 | *.csproj | 3 | *.csproj |
2 | *.csproj.user | 4 | *.csproj.user |
3 | *.build | 5 | *.build |
@@ -24,4 +26,8 @@ OpenSim.build | |||
24 | OpenSim.sln | 26 | OpenSim.sln |
25 | Prebuild/Prebuild.build | 27 | Prebuild/Prebuild.build |
26 | Prebuild/Prebuild.sln | 28 | Prebuild/Prebuild.sln |
29 | bin/OpenSim.log | ||
30 | bin/Physics* | ||
31 | bin/Terrain* | ||
32 | bin/estate_settings.xml | ||
27 | *~ | 33 | *~ |