Branch: master

5f77d155 2014-10-13 20:09:57 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 kdirstat/kdirstatapp.cpp
 
diff --git a/kdirstat/kdirstatapp.cpp b/kdirstat/kdirstatapp.cpp
index 0103aa5..c83496d 100644
--- a/kdirstat/kdirstatapp.cpp
+++ b/kdirstat/kdirstatapp.cpp
@@ -175,11 +175,11 @@
 				       TQT_TQOBJECT(this), TQT_SLOT( cleanupOpenWith() ),
 				       actionCollection(), "cleanup_open_with" );
 
-    _treemapZoomIn 	= new TDEAction( i18n( "Zoom in" ), "viewmag+", Key_Plus,
+    _treemapZoomIn 	= new TDEAction( i18n( "Zoom in" ), "zoom-in", Key_Plus,
 				       TQT_TQOBJECT(this), TQT_SLOT( treemapZoomIn() ),
 				       actionCollection(), "treemap_zoom_in" );
 
-    _treemapZoomOut 	= new TDEAction( i18n( "Zoom out" ), "viewmag-", Key_Minus,
+    _treemapZoomOut 	= new TDEAction( i18n( "Zoom out" ), "zoom-out", Key_Minus,
 				       TQT_TQOBJECT(this), TQT_SLOT( treemapZoomOut() ),
 				       actionCollection(), "treemap_zoom_out" );
b16e1c24 2014-10-13 20:10:36 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kdirstat
M cmake
 
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090