Branch: master

e59d29d1 2014-10-12 17:48:36 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/knutdock.cpp
diff --git a/src/knutdock.cpp b/src/knutdock.cpp
index 8debbb3..fc248f5 100755
--- a/src/knutdock.cpp
+++ b/src/knutdock.cpp
@@ -654,7 +654,7 @@
   m_menu->insertSeparator();
   m_menu->insertItem(i18n("&Minimize"), this, TQT_SLOT(slotMinimize()));
   m_menu->insertSeparator();
-  m_menu->insertItem (SmallIcon("exit"),i18n("&Exit"),this ,TQT_SLOT(slotExitApplication()));
+  m_menu->insertItem (SmallIcon("system-log-out"),i18n("&Exit"),this ,TQT_SLOT(slotExitApplication()));
   }
 
 
e7ecd7db 2014-10-12 17:54:01 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/knutclient
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c