Merge branch 'master' into wp8

2013-12-08 14:17:42 +01:00
parent f550784973 89fb76a8e7
commit 3af4546ef7
59 changed files with 2368 additions and 1486 deletions
@@ -61,7 +61,7 @@ std::string ToHex(T* pointer)
 {															\
 	std::ostringstream stream;								\
 	stream << inString << std::endl;					    \
-	OutputDebugStringA(stream.str().c_str());  \
+	OutputDebugStringA(stream.str().c_str());				\
 }
 #endif // QT_CONFIG
 #endif // Win32, Linux