Branch: master

12060eca 2014-10-13 20:10:00 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 kuickshow/src/kuickshow.cpp
diff --git a/kuickshow/src/kuickshow.cpp b/kuickshow/src/kuickshow.cpp
index 728a770..9a43fc9 100644
--- a/kuickshow/src/kuickshow.cpp
+++ b/kuickshow/src/kuickshow.cpp
@@ -266,7 +266,7 @@
                                   TQT_TQOBJECT(this), TQT_SLOT( about() ), coll, "about" );
 
     oneWindowAction = new TDEToggleAction( i18n("Open Only One Image Window"),
-                                         "window_new",
+                                         "window-new",
                                          TDEShortcut( CTRL+Key_N ), coll,
                                          "kuick_one window" );
 
01a2d016 2014-10-13 20:11:05 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kuickshow
M cmake
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090