diff options
| author | Melanie | 2012-08-29 03:31:13 +0100 |
|---|---|---|
| committer | Melanie | 2012-08-29 03:31:13 +0100 |
| commit | 899337b4a0584ce2371c3bfcc44387d0f090b792 (patch) | |
| tree | 3a3e862951a85889c3c5762d6d30b5dd80868864 /.gitignore | |
| parent | Merge branch 'master' into careminster (diff) | |
| parent | implementing rule tracking (diff) | |
| download | opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.zip opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.gz opensim-SC-899337b4a0584ce2371c3bfcc44387d0f090b792.tar.bz2 opensim-SC-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-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
| @@ -33,6 +33,10 @@ bin/*.db-journal | |||
| 33 | bin/addin-db-* | 33 | bin/addin-db-* |
| 34 | bin/*.dll | 34 | bin/*.dll |
| 35 | bin/OpenSim.vshost.exe.config | 35 | bin/OpenSim.vshost.exe.config |
| 36 | bin/OpenSim.32BitLaunch.vshost.exe.config | ||
| 37 | bin/OpenSim.32BitLaunch.log | ||
| 38 | UpgradeLog.XML | ||
| 39 | _UpgradeReport_Files/ | ||
| 36 | bin/ScriptEngines/*-*-*-*-* | 40 | bin/ScriptEngines/*-*-*-*-* |
| 37 | bin/ScriptEngines/*.dll | 41 | bin/ScriptEngines/*.dll |
| 38 | bin/ScriptEngines/*/*.dll | 42 | bin/ScriptEngines/*/*.dll |