Conflicts:
	indra/newview/llnetmap.cpp
This commit is contained in:
Shyotl
2014-08-05 18:17:13 -05:00
446 changed files with 25784 additions and 9117 deletions

View File

@@ -202,9 +202,9 @@
<key>darwin</key>
<map>
<key>md5sum</key>
<string>b31c495d5e77daa09394b370fc228312</string>
<string>6564a085a5a353a531908d2e6fcafd64</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/boost-1.52.0-darwin-20130221.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/boost-1.52.0-darwin-20140202.tar.bz2</uri>
</map>
<key>linux</key>
<map>
@@ -643,16 +643,16 @@
<key>windows</key>
<map>
<key>md5sum</key>
<string>37d1f91f486e357c9a74e6b4af91fe13</string>
<string>b1eda1b02e7ebf9875733303a88ca27b</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/google_breakpad-0.0.0-rev1099-windows-20131002.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/google_breakpad-0.0.0-rev1099-windows-20140606.tar.bz2</uri>
</map>
<key>windows64</key>
<map>
<key>md5sum</key>
<string>b13ebfa3a82d5396709c57ad83999d83</string>
<string>f9072dda75012868d023c335ea5bcf88</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/google_breakpad-0.0.0-rev1099-windows64-20131019.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/google_breakpad-0.0.0-rev1099-windows64-20140606.tar.bz2</uri>
</map>
</map>
</map>
@@ -771,9 +771,9 @@
<key>windows64</key>
<map>
<key>md5sum</key>
<string>d3ee81e7dfe338b46efc2830930e771e</string>
<string>22fd1388454117626c2477509d3e93be</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/libhunspell-1.3.2-windows64-20131020.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/libhunspell-1.3.2-windows64-20140605.tar.bz2</uri>
</map>
</map>
</map>