merge core/settings/*

- light-and-power and security were a bit ugly, so I recommend someone
  who actually dealt with these files looking into if I got it right
  (not to tell about the frustratation about the fact that the ones who
  dealt with these files didn't do the merge in the first place :(

1 files changed, 1 insertions, 1 deletions

diff --git a/core/settings/launcher/menusettings.h b/core/settings/launcher/menusettings.h
index 5986958..5bb7afa 100644
--- a/core/settings/launcher/menusettings.h
+++ b/core/settings/launcher/menusettings.h
@@ -51,10 +51,10 @@ protected:
         void init ( );
 
 private:
         QListView *m_list;
         QMap <QString, QCheckListItem *> m_applets;
         bool m_applets_changed;
-        QCheckBox *m_menutabs;
+        QCheckBox *m_menutabs, *m_menusubpopup;
 };
 
 #endif