diff options
author | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
---|---|---|
committer | Teravus Ovares (Dan Olivares) | 2009-08-18 11:09:43 -0400 |
commit | 311b51a1843f43daa7796a46961b65fe702e1b85 (patch) | |
tree | 756554b330c8bdd970f319c3af0327efb9017673 /.gitignore | |
parent | * Some Physics Scene Changes to prepare for larger regions (diff) | |
parent | Fixes mantis #4020 (http://opensimulator.org/mantis/view.php?id=4020) (diff) | |
download | opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.zip opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.gz opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.bz2 opensim-SC-311b51a1843f43daa7796a46961b65fe702e1b85.tar.xz |
*remove conflicts
Diffstat (limited to '')
-rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -21,6 +21,7 @@ bin/*.db | |||
21 | bin/addin-db-* | 21 | bin/addin-db-* |
22 | bin/*.dll | 22 | bin/*.dll |
23 | bin/OpenSim.vshost.exe.config | 23 | bin/OpenSim.vshost.exe.config |
24 | bin/ScriptEngines/*-*-*-*-* | ||
24 | bin/ScriptEngines/*.dll | 25 | bin/ScriptEngines/*.dll |
25 | bin/ScriptEngines/*/*.dll | 26 | bin/ScriptEngines/*/*.dll |
26 | bin/ScriptEngines/*/*.state | 27 | bin/ScriptEngines/*/*.state |