Branch: master

57f054d4 2014-10-12 17:48:57 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/preferencesdlg.cpp
diff --git a/src/preferencesdlg.cpp b/src/preferencesdlg.cpp
index f929383..d1a7ae5 100644
--- a/src/preferencesdlg.cpp
+++ b/src/preferencesdlg.cpp
@@ -62,7 +62,7 @@
 	// Create and add the "Frontend" page
 	pFrame = addPage(i18n("Programmes"),
 		i18n("Paths to back-end programmes"),
-		TDEGlobal::iconLoader()->loadIcon("run", TDEIcon::Panel, 0, false));
+		TDEGlobal::iconLoader()->loadIcon("system-run", TDEIcon::Panel, 0, false));
 	pLayout = new TQVBoxLayout(pFrame, 0, 0);
 	m_pPrefFrontend = new PrefFrontend(pFrame);
 	pLayout->addWidget(m_pPrefFrontend);
359bc909 2014-10-12 17:54:21 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kscope
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c