Branch: master

10407d0d 2014-10-12 17:48:33 Timothy Pearson
Bring stop, lock, exit, and run icons into XDG compliance
M knights/knights.cpp
diff --git a/knights/knights.cpp b/knights/knights.cpp
index 0567f85..6daa583 100644
--- a/knights/knights.cpp
+++ b/knights/knights.cpp
@@ -342,7 +342,7 @@
 	fileMenu->setWhatsThis( MENU_CLOSEALL, i18n( "This command will remove all matches that are currently loaded." ) );
 	fileMenu->insertSeparator();
 	// MENU_QUIT
-	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("exit"), TDEIcon::Small ) ),
+	fileMenu->insertItem( TQIconSet( Resource->LoadIcon( TQString("system-log-out"), TDEIcon::Small ) ),
 												i18n( "&Quit" ), this, TQT_SLOT(menuClose()), CTRL+Key_Q, MENU_QUIT );
 	fileMenu->setWhatsThis( MENU_QUIT, i18n( "The Quit command will stop all matches and exit Knights." ) );
 	/*
e9b5526f 2014-10-12 17:53:57 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/knights
M cmake
diff --git a/cmake b/cmake
index 0d5ca8b..08c6f54 160000
--- a/cmake
+++ b/cmake
-Subproject commit 0d5ca8bebbb638b05f1d11537ce41fcf73d10ac9
+Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c