aboutsummaryrefslogtreecommitdiffstatshomepage
path: root/.gitignore
diff options
context:
space:
mode:
authorUbitUmarov2016-11-16 13:07:23 +0000
committerUbitUmarov2016-11-16 13:07:23 +0000
commitec8393571f88ab54a47ffcb91d0f82a815a682ad (patch)
tree362b08a13538a55ef2bff7a3e4290341ce9f159c /.gitignore
parentMerge branch 'master' into httptests (diff)
parent fix parsing of a vector4 and storing on a lsl quaternion needed for lightSha... (diff)
downloadopensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.zip
opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.gz
opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.bz2
opensim-SC-ec8393571f88ab54a47ffcb91d0f82a815a682ad.tar.xz
Merge branch 'master' into httptests
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore
index d1f7710..f77d9f9 100644
--- a/.gitignore
+++ b/.gitignore
@@ -31,6 +31,7 @@
31*/*/*/*/*/bin 31*/*/*/*/*/bin
32*/*/*/*/*/*/bin 32*/*/*/*/*/*/bin
33*/*/*/*/*/*/*/bin 33*/*/*/*/*/*/*/bin
34.vs/
34addon-modules/ 35addon-modules/
35bin/Debug/*.dll 36bin/Debug/*.dll
36bin/*.dll.mdb 37bin/*.dll.mdb
@@ -93,7 +94,6 @@ TAGS
93Makefile.local 94Makefile.local
94bin/.version 95bin/.version
95compile.bat 96compile.bat
96addon-modules
97OpenSim/Data/Tests/test-results/ 97OpenSim/Data/Tests/test-results/
98OpenSim/Framework/Serialization/Tests/test-results/ 98OpenSim/Framework/Serialization/Tests/test-results/
99OpenSim/Framework/Servers/Tests/test-results/ 99OpenSim/Framework/Servers/Tests/test-results/