Skip to content
Snippets Groups Projects
Commit 135d96da authored by callum@lindenlab.com's avatar callum@lindenlab.com
Browse files

Automated merge with head of lindenlab/viewer64

parents bf90329d d18060e4
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 4 additions and 0 deletions
autobuild.xml
+ 4
− 0
View file @ 135d96da
...@@ -3357,6 +3357,7 @@ ...@@ -3357,6 +3357,7 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>Xcode</string> <string>Xcode</string>
<string>-DHAVOK:BOOL=OFF</string>
</array> </array>
</map> </map>
<key>default</key> <key>default</key>
...@@ -3385,6 +3386,7 @@ ...@@ -3385,6 +3386,7 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>Xcode</string> <string>Xcode</string>
<string>-DHAVOK:BOOL=OFF</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -3419,6 +3421,7 @@ ...@@ -3419,6 +3421,7 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>Xcode</string> <string>Xcode</string>
<string>-DHAVOK:BOOL=OFF</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
...@@ -3445,6 +3448,7 @@ ...@@ -3445,6 +3448,7 @@
<array> <array>
<string>-G</string> <string>-G</string>
<string>Xcode</string> <string>Xcode</string>
<string>-DHAVOK:BOOL=OFF</string>
</array> </array>
</map> </map>
<key>name</key> <key>name</key>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment