Branch: master

2ddaee2a 2014-10-12 17:48:12 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/toplevel.cpp
diff --git a/src/toplevel.cpp b/src/toplevel.cpp
index beb0006..6442a78 100644
--- a/src/toplevel.cpp
+++ b/src/toplevel.cpp
@@ -87,7 +87,7 @@
 	menu->insertSeparator();
 	confAct->plug(menu);
 	menu->insertItem(SmallIcon("help"), i18n("&Help"), helpMnu);
-	menu->insertItem(SmallIcon("exit"), i18n("Quit"), kapp, TQT_SLOT(quit()));
+	menu->insertItem(SmallIcon("system-log-out"), i18n("Quit"), kapp, TQT_SLOT(quit()));
 
 	load();
 
50ca467c 2014-10-12 17:53:30 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kerberostray
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c