Merge branch 'master' into medusa
Vicki Pfau vi@endrift.com
Tue, 11 Apr 2017 13:31:05 -0700
3 files changed,
12 insertions(+),
2 deletions(-)
M
CHANGES
→
CHANGES
@@ -101,6 +101,7 @@ - FFmpeg: Return false if a file fails to open
- FFmpeg: Force MP4 files to YUV420P - Qt: Make "Mute" able to be bound to a key - Core: Restore sleep callback + - Qt: Add .gb/.gbc files to the extension list in Info.plist medusa alpha 1: (2017-04-08) Features:
M
res/info.plist.in
→
res/info.plist.in
@@ -44,6 +44,17 @@ <string>Game Boy Advance ROM Image</string>
<key>CFBundleTypeRole</key> <string>Viewer</string> </dict> + <dict> + <key>CFBundleTypeExtensions</key> + <array> + <string>gb</string> + <string>gbc</string> + </array> + <key>CFBundleTypeName</key> + <string>Game Boy ROM Image</string> + <key>CFBundleTypeRole</key> + <string>Viewer</string> + </dict> </array> </dict> </plist>
M
src/platform/qt/ts.cmake
→
src/platform/qt/ts.cmake
@@ -1,8 +1,6 @@
file(GLOB TRANSLATION_FILES "${QM_BASE}/*.qm") file(WRITE ${TRANSLATION_QRC} "<RCC>\n\t<qresource prefix=\"/translations/\">\n") -message(STATUS ${TRANSLATION_FILES}) foreach(TS ${TRANSLATION_FILES}) - message(STATUS ${TS}) get_filename_component(TS_BASE "${TS}" NAME) file(APPEND ${TRANSLATION_QRC} "\t\t<file>${TS_BASE}</file>\n") endforeach()