Merge remote-tracking branch 'upstream/master'

This commit is contained in:
Andros Baphomet
2013-10-19 10:03:17 -04:00
29 changed files with 304 additions and 368 deletions

View File

@@ -40,7 +40,7 @@
</array>
<key>tags</key>
<array>
<string>ShaderLoading</string>
<!--string>ShaderLoading</string-->
<string>Openjpeg</string>
<!-- Debug output about messages received from plugins: -->
<string>Plugin</string> <!-- Everything except what is listed below -->