diff options
| author | Melanie | 2011-10-26 17:48:51 +0100 |
|---|---|---|
| committer | Melanie | 2011-10-26 17:48:51 +0100 |
| commit | 6a96c9546d4fd89f6e9319246cc2270836cf19f7 (patch) | |
| tree | e6492419b9a03cb78435e911b345b4a31f749162 /.gitignore | |
| parent | Merge branch 'master' into bigmerge (diff) | |
| parent | Merge branch 'master' of /home/opensim/var/repo/opensim (diff) | |
| download | opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.zip opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.gz opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.bz2 opensim-SC_OLD-6a96c9546d4fd89f6e9319246cc2270836cf19f7.tar.xz | |
Merge branch 'master' into bigmerge
Conflicts:
OpenSim/Region/ScriptEngine/Shared/Api/Implementation/LSL_Api.cs
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 18 |
1 files changed, 17 insertions, 1 deletions
| @@ -73,4 +73,20 @@ TAGS | |||
| 73 | Makefile.local | 73 | Makefile.local |
| 74 | bin/.version | 74 | bin/.version |
| 75 | compile.bat | 75 | compile.bat |
| 76 | 76 | addon-modules | |
| 77 | OpenSim/Data/Tests/test-results/ | ||
| 78 | OpenSim/Framework/Serialization/Tests/test-results/ | ||
| 79 | OpenSim/Framework/Servers/Tests/test-results/ | ||
| 80 | OpenSim/Framework/Tests/test-results/ | ||
| 81 | OpenSim/Region/ClientStack/Linden/Caps/test-results/ | ||
| 82 | OpenSim/Region/ClientStack/Linden/UDP/Tests/test-results/ | ||
| 83 | OpenSim/Region/CoreModules/test-results/ | ||
| 84 | OpenSim/Region/Framework/test-results/ | ||
| 85 | OpenSim/Region/OptionalModules/test-results/ | ||
| 86 | OpenSim/Region/Physics/BulletDotNETPlugin/ | ||
| 87 | OpenSim/Region/Physics/Manager/test-results/ | ||
| 88 | OpenSim/Region/Physics/OdePlugin/Tests/test-results/ | ||
| 89 | OpenSim/Region/ScriptEngine/test-results/ | ||
| 90 | OpenSim/Tests/Common/test-results/ | ||
| 91 | OpenSim/Tests/test-results/ | ||
| 92 | test-results/ | ||