# HG changeset patch
# User unc0rr
# Date 1388093103 -14400
# Node ID 6c4dbe67fd7dce631b47f93084d89c3fbfc57659
# Parent  b1e4f0dddfb5f466e152575724c18006316b40c4# Parent  fa615abab6c28caa0a8f6171372ac9abc21011de
merge

diff -r fa615abab6c2 -r 6c4dbe67fd7d ChangeLog.txt
--- a/ChangeLog.txt	Wed Dec 25 00:56:44 2013 +0400
+++ b/ChangeLog.txt	Fri Dec 27 01:25:03 2013 +0400
@@ -8,6 +8,7 @@
  + New rubber utility, lfBouncy mask (green) for maps.  lfBouncy is also anti-portal.
  + Lazy loading of many aspects of frontend to improve startup time under Windows
  + Set hog/team/health label defaults in config, toggle team health display using delete (left shift + delete for labels now)
+ + Usernames next to teams when playing online.
  + Can now filter rooms by game style (such as Highlander). Filtering simplified since it is mostly unused.
  + AFK mode.  Press p when not your turn online to trigger autoskip of your turn.
  + Russian localisation of Default voice.
diff -r fa615abab6c2 -r 6c4dbe67fd7d QTfrontend/ui/page/pagemain.cpp
--- a/QTfrontend/ui/page/pagemain.cpp	Wed Dec 25 00:56:44 2013 +0400
+++ b/QTfrontend/ui/page/pagemain.cpp	Fri Dec 27 01:25:03 2013 +0400
@@ -183,6 +183,7 @@
         QFile file(tipFile);
         file.open(QIODevice::ReadOnly);
         QTextStream in(&file);
+        in.setCodec("UTF-8");
         QString line = in.readLine();
         int tip_platform = 0;
         while (!line.isNull()) {
diff -r fa615abab6c2 -r 6c4dbe67fd7d tools/CreateMacBundle.cmake.in
--- a/tools/CreateMacBundle.cmake.in	Wed Dec 25 00:56:44 2013 +0400
+++ b/tools/CreateMacBundle.cmake.in	Fri Dec 27 01:25:03 2013 +0400
@@ -19,16 +19,18 @@
 endif()
 
 if(doBundle EQUAL 1)
-    execute_process(COMMAND cp -pPR ${sdl_library_only} ${frameworks_dir}/SDL.framework)
-    execute_process(COMMAND cp -pPR ${SDLIMAGE_LIBRARY} ${frameworks_dir}/SDL_image.framework)
-    execute_process(COMMAND cp -pPR ${SDLNET_LIBRARY}   ${frameworks_dir}/SDL_net.framework)
-    execute_process(COMMAND cp -pPR ${SDLTTF_LIBRARY}   ${frameworks_dir}/SDL_ttf.framework)
-    execute_process(COMMAND cp -pPR ${SDLMIXER_LIBRARY} ${frameworks_dir}/SDL_mixer.framework)
-    execute_process(COMMAND cp -pPR ${OGG_LIBRARY}      ${frameworks_dir}/Ogg.framework)
-    execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY}   ${frameworks_dir}/Vorbis.framework)
+    execute_process(COMMAND cp ${PNG_LIBRARY} ${frameworks_dir})
+
+    execute_process(COMMAND cp -pPR ${sdl_library_only} ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLIMAGE_LIBRARY} ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLNET_LIBRARY}   ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLTTF_LIBRARY}   ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${SDLMIXER_LIBRARY} ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${OGG_LIBRARY}      ${frameworks_dir})
+    execute_process(COMMAND cp -pPR ${VORBIS_LIBRARY}   ${frameworks_dir})
 
     if(${SPARKLE_FOUND})
-        execute_process(COMMAND cp -pPR ${SPARKLE_LIBRARY} ${frameworks_dir}/Sparkle.framework)
+        execute_process(COMMAND cp -pPR ${SPARKLE_LIBRARY} ${frameworks_dir})
     endif()
     message(STATUS "Frameworks and libraries successfully copied...")
 else()