Branch: master

a660d90f 2014-10-12 17:48:46 Timothy Pearson 
Bring stop, lock, exit, and run icons into XDG compliance
M chalk/ui/kis_label_progress.cc
 
diff --git a/chalk/ui/kis_label_progress.cc b/chalk/ui/kis_label_progress.cc
index bd19501..0caadcb 100644
--- a/chalk/ui/kis_label_progress.cc
+++ b/chalk/ui/kis_label_progress.cc
@@ -53,7 +53,7 @@
     TQHBoxLayout *box = new TQHBoxLayout(this);
     box->setAutoAdd(true);
 
-    TQIconSet cancelIconSet = SmallIconSet("stop");
+    TQIconSet cancelIconSet = SmallIconSet("process-stop");
 
     m_cancelButton = new EscapeButton(this, "cancel_button");
     m_cancelButton->setIconSet(cancelIconSet);
b15717a9 2014-10-12 17:54:05 Timothy Pearson 
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/koffice
M cmake
 
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c