From 55ea6367fba8a82fbdca74599422717e4b3c3ec6 Mon Sep 17 00:00:00 2001
From: mickeyl <mickeyl>
Date: Thu, 06 Nov 2003 10:17:45 +0000
Subject: 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 :(
---
(limited to 'core/settings/launcher/tabssettings.h')

diff --git a/core/settings/launcher/tabssettings.h b/core/settings/launcher/tabssettings.h
index 439def6..600c65c 100644
--- a/core/settings/launcher/tabssettings.h
+++ b/core/settings/launcher/tabssettings.h
@@ -59,7 +59,7 @@ private:
 //	QString currentTab;
 	QStringList m_ids;
 	QMap <QString, TabConfig> m_tabs;
-	QCheckBox *m_busyblink, *m_bigbusy;
+	QCheckBox *m_busyani, *m_bigbusy;
 };
 
 
--
cgit v0.9.0.2