Merge branch 'master' into meshupload

Conflicts:
	indra/cmake/00-Common.cmake

One diff added /MP to CMAKE_CXX_FLAGS_DEBUG while
another removed /arch:SSE2 from the same line.

Fixed to honor both changes.
This commit is contained in:
Aleric Inglewood
2013-01-21 19:09:11 +01:00
62 changed files with 1185 additions and 781 deletions

View File

@@ -867,9 +867,9 @@
<key>linux64</key>
<map>
<key>md5sum</key>
<string>c6f662eaa9aeaf03f73779393640f386</string>
<string>50ab4b0642c427e062f4e86b5421eb01</string>
<key>url</key>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-linux-x86_64-20120716.tar.bz2</uri>
<uri>https://bitbucket.org/SingularityViewer/libraries/downloads/llqtwebkit-4.7.1-linux64-20130116.tar.bz2</uri>
</map>
<key>windows</key>
<map>