Branch: master

82d00600 2014-10-13 20:09:57 Timothy Pearson
Bring mail_forward, mail_new, mail_replyall, mail_reply, mail_send, player_pause, player_play, player_stop, player_rew, player_fwd, player_start, player_end, rotate_ccw, rotate_cw, window_fullscreen, window_nofullscreen, window_new, viewmagfit, viewmag+, viewmag1, and viewmag- icons into XDG compliance
M src/kile/kile.cpp
diff --git a/src/kile/kile.cpp b/src/kile/kile.cpp
index d114471..90b3974 100644
--- a/src/kile/kile.cpp
+++ b/src/kile/kile.cpp
@@ -528,7 +528,7 @@
 	(void) new TDEAction(i18n("Refresh Str&ucture"), "refreshstructure", Key_F12, TQT_TQOBJECT(this), TQT_SLOT(refreshStructure()), actionCollection(),"RefreshStructure" );
 
 	//project actions
-	(void) new TDEAction(i18n("&New Project..."), "window_new", 0, docManager(), TQT_SLOT(projectNew()), actionCollection(), "project_new");
+	(void) new TDEAction(i18n("&New Project..."), "window-new", 0, docManager(), TQT_SLOT(projectNew()), actionCollection(), "project_new");
 	(void) new TDEAction(i18n("&Open Project..."), "project_open", 0, docManager(), TQT_SLOT(projectOpen()), actionCollection(), "project_open");
 	m_actRecentProjects =  new TDERecentFilesAction(i18n("Open &Recent Project"),  0, docManager(), TQT_SLOT(projectOpen(const KURL &)), actionCollection(), "project_openrecent");
 	connect(docManager(), TQT_SIGNAL(removeFromRecentProjects(const KURL& )), m_actRecentProjects, TQT_SLOT(removeURL(const KURL& )));
a9fa0a70 2014-10-13 20:10:39 Timothy Pearson
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/kile
M cmake
diff --git a/cmake b/cmake
index 08c6f54..47d7755 160000
--- a/cmake
+++ b/cmake
-Subproject commit 08c6f54d6f80554caa671847417cf04326adb63c
+Subproject commit 47d775518c382c77f663a70bb23fad93e6810090