aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorMelanie2010-04-29 23:33:26 +0100
committerMelanie2010-04-29 23:33:26 +0100
commit08ebcdb0b8122b687fb27d21076d0d01941ed8e2 (patch)
tree311775c3fc4db3ccb3f6b12376a69b0d08aede89 /.gitignore
parentMerge branch 'careminster' into careminster-presence-refactor (diff)
parentStarted redoing HGInventoryBroker for XInventory and with multi-protocol in m... (diff)
downloadopensim-SC_OLD-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.zip
opensim-SC_OLD-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.gz
opensim-SC_OLD-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.bz2
opensim-SC_OLD-08ebcdb0b8122b687fb27d21076d0d01941ed8e2.tar.xz
Merge branch 'master' into careminster-presence-refactor
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore9
1 files changed, 9 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index b6b5582..8d3f2b2 100644
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,14 @@
9*.pdb 9*.pdb
10*.pidb 10*.pidb
11*.dll.build 11*.dll.build
12*.dll
13*.VisualState.xml
14*/*/obj
15*/*/*/obj
16*/*/*/*/obj
17*/*/*/*/*/obj
18*/*/*/*/*/*/obj
19*/*/*/*/*/*/*/obj
12*/*/bin 20*/*/bin
13*/*/*/bin 21*/*/*/bin
14*/*/*/*/bin 22*/*/*/*/bin
@@ -45,6 +53,7 @@ bin/OpenSim.Grid.InventoryServer.log
45bin/OpenSim.Grid.MessagingServer.log 53bin/OpenSim.Grid.MessagingServer.log
46bin/OpenSim.Grid.UserServer.log 54bin/OpenSim.Grid.UserServer.log
47bin/OpenSim.log 55bin/OpenSim.log
56bin/*.manifest
48bin/crashes/ 57bin/crashes/
49Examples/*.dll 58Examples/*.dll
50OpenSim.build 59OpenSim.build