Merge branch 'master' of git://github.com/zinnschlag/openmw into graphics

components/bsa/bsa_archive.cpp

@@ -91,7 +91,7 @@ public:
 
             std::string searchable = normalize_path (proper.begin () + prefix, proper.end ());
 
-            mIndex.insert (std::make_pair (std::move (searchable), std::move (proper)));
+            mIndex.insert (std::make_pair (searchable, proper));
         }
     }
 

components/files/constrainedfiledatastream.cpp

@@ -3,11 +3,8 @@
 
 #include <stdexcept>
 #include <cassert>
-#ifndef __clang__
-#include <cstdint>
-#else
-#include <tr1/cstdint>
-#endif
+
+#include <libs/platform/stdint.h>
 
 namespace {
 
@@ -29,7 +26,7 @@ public:
 		mBufferOrigin = 0;
 		mBufferExtent = 0;
 	}
-		
+
 
 	size_t read(void* buf, size_t count)
 	{