summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--XCODE_6_UPGRADES_TODO.txt2
-rwxr-xr-xautobuild.xml6
2 files changed, 3 insertions, 5 deletions
diff --git a/XCODE_6_UPGRADES_TODO.txt b/XCODE_6_UPGRADES_TODO.txt
index 074e09c680..18df55b9d0 100644
--- a/XCODE_6_UPGRADES_TODO.txt
+++ b/XCODE_6_UPGRADES_TODO.txt
@@ -5,5 +5,3 @@
* Should we be using libstdc++ (GNU) or libc++ (clang) - using the former but latter is more 'clang'y - see comments from Cinder in BB
* Weird folder name "build-darwin-i386/newview/$(CONFIGURATION)$(EFFECTIVE_PLATFORM_NAME)/Second Life.app" - likely causes because those $() should be ${} for CMake? - No, it's something else - lots of occurences in build-darwin folder but where do they come from? ....
-
-* libjpeg is placed in lib folder vs lib/release - change it to match others
diff --git a/autobuild.xml b/autobuild.xml
index 9e665dad6f..0ec17caef9 100755
--- a/autobuild.xml
+++ b/autobuild.xml
@@ -1154,9 +1154,9 @@
<key>archive</key>
<map>
<key>hash</key>
- <string>df84cdb8e6d34f76d0f80d9fd36a260b</string>
+ <string>612ae26d3a644ec68c99cd2fefb5a36c</string>
<key>url</key>
- <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jpeglib_3p-update-jpeglib/rev/295494/arch/Darwin/installer/jpeglib-8c.295494-darwin-295494.tar.bz2</string>
+ <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/jpeglib_3p-update-jpeglib/rev/295876/arch/Darwin/installer/jpeglib-8c.295876-darwin-295876.tar.bz2</string>
</map>
<key>name</key>
<string>darwin</string>
@@ -1187,7 +1187,7 @@
</map>
</map>
<key>version</key>
- <string>8c.295494</string>
+ <string>8c.295876</string>
</map>
<key>jsoncpp</key>
<map>