Skip to content
Snippets Groups Projects
Commit ddd5659f authored by Oz Linden's avatar Oz Linden
Browse files

merge changes for DRTVWR-294

parents ed2b5da8 be1bb8d7
No related branches found
No related tags found
No related merge requests found
Showing
with 16 additions and 14 deletions
.hgignore 100644 → 100755
File mode changed from 100644 to 100755
.hgtags 100644 → 100755
...@@ -439,3 +439,4 @@ adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release ...@@ -439,3 +439,4 @@ adc360e6bf21390d2665380951d85937cd29a604 3.5.0-release
2319904200de367646b9a9442239a38d52c1eeb5 DRTVWR-313 2319904200de367646b9a9442239a38d52c1eeb5 DRTVWR-313
9d8726eca785acad694564516f16dd639faf45c0 3.5.1-beta2 9d8726eca785acad694564516f16dd639faf45c0 3.5.1-beta2
78a8fe6abf331944d6b6bb1ce1024a6bc08141f4 DRTVWR-298 78a8fe6abf331944d6b6bb1ce1024a6bc08141f4 DRTVWR-298
50ccc12f38c3c99f03b374e32429cb043b73e2a6 DRTVWR-294
BuildParams 100644 → 100755
File mode changed from 100644 to 100755
autobuild.xml 100644 → 100755
...@@ -606,9 +606,9 @@ ...@@ -606,9 +606,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>ca95bbdabd2bed612af79a3704fdbe79</string> <string>bd6f84f9fb3c2e68850676d06935373f</string>
<key>url</key> <key>url</key>
<string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/265843/arch/Linux/installer/freetype-2.3.9-linux-20121013.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-freetype/rev/271684/arch/Linux/installer/freetype-2.4.4-linux-20130312.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -747,6 +747,7 @@ ...@@ -747,6 +747,7 @@
</map> </map>
</map> </map>
</map> </map>
<key>google_breakpad</key> <key>google_breakpad</key>
<map> <map>
<key>license</key> <key>license</key>
...@@ -761,10 +762,10 @@ ...@@ -761,10 +762,10 @@
<map> <map>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>21babc394dbf8572830f2e85adec7b9f</string> <string>aff5566e04003de0383941981198e04e</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-darwin-20110202.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/Darwin/installer/google_breakpad-0.0.0-rev1099-darwin-20130329.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>darwin</string> <string>darwin</string>
...@@ -773,10 +774,10 @@ ...@@ -773,10 +774,10 @@
<map> <map>
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>204b02a9480c411232255798839431a2</string> <string>52257e5eb166a0b69c9c0c38f6e1920e</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-linux-20110311.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273079/arch/Linux/installer/google_breakpad-0.0.0-rev1099-linux-20130329.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>linux</string> <string>linux</string>
...@@ -786,9 +787,9 @@ ...@@ -786,9 +787,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>627c51136e14e64c5d39933f3abd3bdf</string> <string>d812a6dfcabe6528198a3191068dac09</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/google_breakpad-0.0.0-rev599-windows-20110218.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-breakpad/rev/273073/arch/CYGWIN/installer/google_breakpad-0.0.0-rev1099-windows-20130329.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
...@@ -834,9 +835,9 @@ ...@@ -834,9 +835,9 @@
<key>archive</key> <key>archive</key>
<map> <map>
<key>hash</key> <key>hash</key>
<string>212701468920519f3989677cea9ca4f1</string> <string>98994d5b0b4b3d43be22aa6a5c36e6fa</string>
<key>url</key> <key>url</key>
<string>http://s3.amazonaws.com/viewer-source-downloads/install_pkgs/gmock-1.5.0-windows-20110224.tar.bz2</string> <string>http://automated-builds-secondlife-com.s3.amazonaws.com/hg/repo/3p-google-mock-graham/rev/272961/arch/CYGWIN/installer/gmock-1.6.0-windows-20130327.tar.bz2</string>
</map> </map>
<key>name</key> <key>name</key>
<string>windows</string> <string>windows</string>
......
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
File mode changed from 100644 to 100755
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment