Branch: master

8e772af9 2014-10-12 17:49:38 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M yakuake/src/main_window.cpp
diff --git a/yakuake/src/main_window.cpp b/yakuake/src/main_window.cpp
index 119d9c1..974a6e5 100644
--- a/yakuake/src/main_window.cpp
+++ b/yakuake/src/main_window.cpp
@@ -135,7 +135,7 @@
                               TQT_TQOBJECT(this), TQT_SLOT(slotSetAccessKey()),
                               actionCollection(), "global_shortcuts");
 
-    action = new TDEAction(i18n("Quit"), SmallIcon("exit"), 0, TQT_TQOBJECT(this),
+    action = new TDEAction(i18n("Quit"), SmallIcon("system-log-out"), 0, TQT_TQOBJECT(this),
                               TQT_SLOT(close()), actionCollection(), "quit");
 
     KStdAction::keyBindings(TQT_TQOBJECT(this), TQT_SLOT(slotSetControlKeys()), actionCollection());
bb117590 2014-10-12 17:55:33 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/yakuake
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c