Branch: master

0f5c4a5f 2014-10-13 20:09:59 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 src/kscopepixmaps.cpp
diff --git a/src/kscopepixmaps.cpp b/src/kscopepixmaps.cpp
index cc26c3f..31eb251 100644
--- a/src/kscopepixmaps.cpp
+++ b/src/kscopepixmaps.cpp
@@ -335,11 +335,11 @@
 			0, false);
 		
 	case ButtonZoomIn:
-		return m_loader.loadIcon("viewmag+", TDEIcon::Toolbar, 
+		return m_loader.loadIcon("zoom-in", TDEIcon::Toolbar, 
 			0, false);
 		
 	case ButtonZoomOut:
-		return m_loader.loadIcon("viewmag-", TDEIcon::Toolbar, 
+		return m_loader.loadIcon("zoom-out", TDEIcon::Toolbar, 
 			0, false);
 		
 	case ButtonRotate:
bc38240c 2014-10-13 20:11:01 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kscope
M cmake
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090