Merge branch 'origin/next'

This commit is contained in:
Kjell Kernen
2014-02-20 08:38:38 +01:00
334 changed files with 44617 additions and 178 deletions
+2 -2
View File
@@ -99,7 +99,7 @@ private slots:
void setTheme(int index);
void setClassicTheme() {setTheme(0);};
void setNewTheme() {setTheme(1);};
void setYericoTheme() {setTheme(1);};
void setMonoWhiteTheme() {setTheme(2);};
void setMonochromeTheme(){setTheme(3);};
void setMonoBlueTheme() {setTheme(4);};
@@ -256,7 +256,7 @@ private:
QAction *profileActs[MAX_PROFILES];
QAction *createProfileAct;
QAction *classicThemeAct;
QAction *newThemeAct;
QAction *yericoThemeAct;
QAction *monoThemeAct;
QAction *monoBlueAct;
QAction *monoWhiteAct;