Branch: master

8a23da65 2014-10-12 17:48:58 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M src/lmsensorsdock.cpp
diff --git a/src/lmsensorsdock.cpp b/src/lmsensorsdock.cpp
index bda6c53..74ba610 100644
--- a/src/lmsensorsdock.cpp
+++ b/src/lmsensorsdock.cpp
@@ -75,7 +75,7 @@
   helpmenu_id=menu->insertItem(SmallIcon("help"), i18n("&Help"), helpmenu);
   menu->insertSeparator();
   if(!noDock) menu->insertItem(sensorsWidget ? i18n("&Minimize"):i18n("&Restore"), this, SLOT(minimizeRestoreWidget() ) ,0,100 );
-  menu->insertItem(SmallIcon("exit"),i18n("&Exit"), this, SLOT(close()),0,102);
+  menu->insertItem(SmallIcon("system-log-out"),i18n("&Exit"), this, SLOT(close()),0,102);
 }
 
 void LMSensorsDock::createWidgets()
6d8a3e16 2014-10-12 17:54:22 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/ksensors
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c