diff options
| author | teravus | 2012-11-15 10:05:16 -0500 |
|---|---|---|
| committer | teravus | 2012-11-15 10:05:16 -0500 |
| commit | e9153e1d1aae50024d8cd05fe14a9bce34343a0e (patch) | |
| tree | bc111d34f95a26b99c7e34d9e495dc14d1802cc3 /.gitignore | |
| parent | Merge master into teravuswork (diff) | |
| download | opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.zip opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.gz opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.bz2 opensim-SC-e9153e1d1aae50024d8cd05fe14a9bce34343a0e.tar.xz | |
Revert "Merge master into teravuswork", it should have been avination, not master.
This reverts commit dfac269032300872c4d0dc507f4f9062d102b0f4, reversing
changes made to 619c39e5144f15aca129d6d999bcc5c34133ee64.
Diffstat (limited to '')
| -rw-r--r-- | .gitignore | 6 |
1 files changed, 0 insertions, 6 deletions
| @@ -29,14 +29,9 @@ addon-modules/ | |||
| 29 | bin/Debug/*.dll | 29 | bin/Debug/*.dll |
| 30 | bin/*.dll.mdb | 30 | bin/*.dll.mdb |
| 31 | bin/*.db | 31 | bin/*.db |
| 32 | bin/*.db-journal | ||
| 33 | bin/addin-db-* | 32 | bin/addin-db-* |
| 34 | bin/*.dll | 33 | bin/*.dll |
| 35 | bin/OpenSim.vshost.exe.config | 34 | bin/OpenSim.vshost.exe.config |
| 36 | bin/OpenSim.32BitLaunch.vshost.exe.config | ||
| 37 | bin/OpenSim.32BitLaunch.log | ||
| 38 | UpgradeLog.XML | ||
| 39 | _UpgradeReport_Files/ | ||
| 40 | bin/ScriptEngines/*-*-*-*-* | 35 | bin/ScriptEngines/*-*-*-*-* |
| 41 | bin/ScriptEngines/*.dll | 36 | bin/ScriptEngines/*.dll |
| 42 | bin/ScriptEngines/*/*.dll | 37 | bin/ScriptEngines/*/*.dll |
| @@ -69,7 +64,6 @@ Examples/*.dll | |||
| 69 | OpenSim.build | 64 | OpenSim.build |
| 70 | OpenSim.sln | 65 | OpenSim.sln |
| 71 | OpenSim.suo | 66 | OpenSim.suo |
| 72 | OpenSim.userprefs | ||
| 73 | Prebuild/Prebuild.build | 67 | Prebuild/Prebuild.build |
| 74 | Prebuild/Prebuild.sln | 68 | Prebuild/Prebuild.sln |
| 75 | TestResult.xml | 69 | TestResult.xml |