diff -r 572294aa6075 -r f48d04161a92 controlpanel/controlpanel.pro
--- a/controlpanel/controlpanel.pro	Fri Jun 11 16:24:54 2010 +0100
+++ b/controlpanel/controlpanel.pro	Thu Jul 22 16:35:53 2010 +0100
@@ -18,4 +18,5 @@
 SUBDIRS =  src 
 CONFIG += ordered
 
-include(rom/cp_rom.pri)
\ No newline at end of file
+include(rom/cp_rom.pri)
+include(conf/conf.pri)
\ No newline at end of file