diff options
author | UbitUmarov | 2016-11-16 13:07:23 +0000 |
---|---|---|
committer | UbitUmarov | 2016-11-16 13:07:23 +0000 |
commit | ec8393571f88ab54a47ffcb91d0f82a815a682ad (patch) | |
tree | 362b08a13538a55ef2bff7a3e4290341ce9f159c /.gitignore | |
parent | Merge branch 'master' into httptests (diff) | |
parent | fix parsing of a vector4 and storing on a lsl quaternion needed for lightSha... (diff) | |
download | opensim-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-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -31,6 +31,7 @@ | |||
31 | */*/*/*/*/bin | 31 | */*/*/*/*/bin |
32 | */*/*/*/*/*/bin | 32 | */*/*/*/*/*/bin |
33 | */*/*/*/*/*/*/bin | 33 | */*/*/*/*/*/*/bin |
34 | .vs/ | ||
34 | addon-modules/ | 35 | addon-modules/ |
35 | bin/Debug/*.dll | 36 | bin/Debug/*.dll |
36 | bin/*.dll.mdb | 37 | bin/*.dll.mdb |
@@ -93,7 +94,6 @@ TAGS | |||
93 | Makefile.local | 94 | Makefile.local |
94 | bin/.version | 95 | bin/.version |
95 | compile.bat | 96 | compile.bat |
96 | addon-modules | ||
97 | OpenSim/Data/Tests/test-results/ | 97 | OpenSim/Data/Tests/test-results/ |
98 | OpenSim/Framework/Serialization/Tests/test-results/ | 98 | OpenSim/Framework/Serialization/Tests/test-results/ |
99 | OpenSim/Framework/Servers/Tests/test-results/ | 99 | OpenSim/Framework/Servers/Tests/test-results/ |