Branch: master

3a7689ed 2014-10-13 20:09:55 Timothy Pearson
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance
M bibletime/util/cresmgr.cpp
diff --git a/bibletime/util/cresmgr.cpp b/bibletime/util/cresmgr.cpp
index ef1c3d1..47c5f04 100644
--- a/bibletime/util/cresmgr.cpp
+++ b/bibletime/util/cresmgr.cpp
@@ -121,7 +121,7 @@
 			namespace showFullscreen {
 				TQString tooltip;
 
-				const TQString icon        = "window_fullscreen";
+				const TQString icon        = "view-fullscreen";
 				const TDEShortcut accel     = TQt::CTRL + TQt::SHIFT + TQt::Key_F;
 				const char* actionName    = "windowFullscreen_action";
 			}
9702eef5 2014-10-13 20:10:19 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/bibletime
M cmake
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090