aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorMelanie2012-08-29 03:31:13 +0100
committerMelanie2012-08-29 03:31:13 +0100
commit899337b4a0584ce2371c3bfcc44387d0f090b792 (patch)
tree3a3e862951a85889c3c5762d6d30b5dd80868864 /.gitignore
parentMerge branch 'master' into careminster (diff)
parentimplementing rule tracking (diff)
downloadopensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.zip
opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz
opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2
opensim-SC_OLD-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.xz
Merge branch 'master' into careminster
Conflicts: OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs OpenSim/Region/ScriptEngine/Shared/Api/Interface/ILSL_Api.cs
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 4 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore
index af7e18b..dc4087e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -33,6 +33,10 @@ bin/*.db-journal
33bin/addin-db-* 33bin/addin-db-*
34bin/*.dll 34bin/*.dll
35bin/OpenSim.vshost.exe.config 35bin/OpenSim.vshost.exe.config
36bin/OpenSim.32BitLaunch.vshost.exe.config
37bin/OpenSim.32BitLaunch.log
38UpgradeLog.XML
39_UpgradeReport_Files/
36bin/ScriptEngines/*-*-*-*-* 40bin/ScriptEngines/*-*-*-*-*
37bin/ScriptEngines/*.dll 41bin/ScriptEngines/*.dll
38bin/ScriptEngines/*/*.dll 42bin/ScriptEngines/*/*.dll