3 files changed, 34 insertions, 2 deletions

diff --git a/Rules.make b/Rules.make
index a1e6f09..86543bb 100644
--- a/Rules.make
+++ b/Rules.make
@@ -1,206 +1,206 @@
 .phony: force
 force:
 
 $(configs) :
         $(call makecfg,$@)
 
 $(TOPDIR)/gen.pro : $(TOPDIR)/.config
         echo > $@
 ifneq ($(CONFIG_DEBUG),)
         echo CONFIG += debug >> $@
         echo CONFIG -= release >> $@
 else
         echo CONFIG -= debug >> $@
         echo CONFIG += release >> $@
 endif
 ifeq ($(filter 3.%,$(QTE_VERSION)),) # not qt3
         echo CONFIG -= qt3 >> $@
 else
         echo CONFIG += qt3 >> $@
 endif
-ifeq ($(CONFIG_QUICK_LAUNCH),)
+ifneq ($(CONFIG_QUICK_LAUNCH),)
         echo contains\( CONFIG, quick-app \) \{ >> $@
         echo CONFIG -= quick-app >> $@
         echo CONFIG += quick-app-lib >> $@
         echo \} >> $@
 else
         echo contains\( CONFIG, quick-app \) \{ >> $@
         echo CONFIG -= quick-app >> $@
         echo CONFIG += quick-app-bin >> $@
         echo \} >> $@
         endif
 ifeq ($(CONFIG_OPIE_NO_OVERRIDE_QT),y)
         echo CONFIG += no-override >> $@
 endif
 
 $(TOPDIR)/.depends : $(shell if [ -e $(TOPDIR)/config.in ]\; then echo $(TOPDIR)/config.in\; fi\;) $(TOPDIR)/.config $(TOPDIR)/packages
         @echo Generating dependency information...
 # add to subdir-y, and add descend rules
         @cat $(TOPDIR)/packages | grep -v '^#' | \
                 awk '{print \
                         ".PHONY : " $$2 "\n" \
                         "subdir-$$(" $$1 ") += " $$2 "\n\n"; \
                         print $$2 " : " $$2 "/Makefile\n\t$$(call descend,$$@,$(filter-out $$@,$$(filter-out $$@,$$(MAKECMDGOALS))))\n"; }' > $(TOPDIR)/.depends
         cat $(TOPDIR)/packages | grep -v '^#' | \
                 perl -ne '($$cfg, $$dir, $$pro) = $$_ =~ /^(\S+)\s+(\S+)\s+(\S+)/; if ( -e "$$dir/$$pro" ) { print "$$dir/Makefile : $$dir/$$pro \$$(QMAKE) \$$(OPIEDIR)/gen.pro \$$(OPIEDIR)/.config\n\t\$$(call makefilegen,\$$@)\n\n"; }' \
                         >> $(TOPDIR)/.depends
 # interpackage dependency generation
         @cat $(TOPDIR)/packages | \
                 $(TOPDIR)/scripts/deps.pl >> $(TOPDIR)/.depends
 
 $(TOPDIR)/.depends.cfgs:
 # config.in interdependencies
         @echo $(configs) | sed -e 's,/config.in,,g' | ( for i in `cat`; do echo $$i; done ) > dirs
         @cat dirs | ( for i in `cat`; do if [ "`cat dirs|grep $$i 2>/dev/null|wc -l`" -ne "1" ]; then deps=`cat dirs|grep $$i| grep -v "^$$i$$"|for i in \`cat|sed -e's,^$(TOPDIR)/,$$(TOPDIR)/,g'\`; do echo $$i/config.in; done`; echo `echo $$i/config.in|sed -e 's,^$(TOPDIR)/,$$(TOPDIR)/,'` : $$deps; fi; done ) >> $@
         @-rm -f dirs
 
 $(QTDIR)/stamp-headers :
         @-rm -f $(QTDIR)/stamp-headers*
         ( cd $(QTDIR)/include; \
                 $(patsubst %,ln -sf ../src/kernel/%;,qgfx_qws.h qwsmouse_qws.h \
                 qcopchannel_qws.h qwindowsystem_qws.h \
                 qfontmanager_qws.h qwsdefaultdecoration_qws.h))
         touch $@
 
 $(QTDIR)/stamp-headers-x11 :
         @-rm -f $(QTDIR)/stamp-headers*
         cd $(QTDIR)/include; $(patsubst %,ln -sf $(OPIEDIR)/x11/libqpe-x11/qt/%;,qgfx_qws.h qwsmouse_qws.h qcopchannel_qws.h qwindowsystem_qws.h qfontmanager_qws.h qwsdefaultdecoration_qws.h)
         touch $@
 
 $(OPIEDIR)/stamp-headers :
         @-rm -f $(OPIEDIR)/stamp-headers*
         mkdir -p $(TOPDIR)/include/qpe \
                  $(TOPDIR)/include/qtopia \
                  $(TOPDIR)/include/opie \
                  $(TOPDIR)/include/opie2 \
                  $(TOPDIR)/include/qtopia/private 
         ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
         ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
         ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
         ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
         ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
         ( cd include/opie &&  ln -sf ../../libopie/big-screen/*.h .;   )
         ( cd include/opie2 && ln -sf ../../libopie2/opiecore/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiemm/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opiedb/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opienet/*.h .; )
         #( cd include/opie2 && ln -sf ../../libopie2/opiepim/*.h .; )
         ( cd include/opie2 && ln -sf ../../libopie2/opieui/*.h .; )
         ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
         ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
         touch $@
         
 $(OPIEDIR)/stamp-headers-x11 :
         @-rm -f $(OPIEDIR)/stamp-headers*
         mkdir -p $(TOPDIR)/include/qpe $(TOPDIR)/include/qtopia \
                 $(TOPDIR)/include/opie $(TOPDIR)/include/qtopia/private
         ( cd include/qpe &&  rm -f *.h; ln -sf ../../library/*.h .; ln -sf ../../library/backend/*.h .; rm -f *_p.h; )
         ( cd include/qtopia && rm -f *.h; ln -sf ../../library/*.h .; )
         ( cd include/qtopia/private && rm -f *.h; ln -sf ../../../library/backend/*.h .; )
         ( cd include/opie &&  rm -f *.h; ln -sf ../../libopie/*.h .; rm -f *_p.h; )
         ( cd include/opie &&  ln -sf ../../libsql/*.h .; )
         ( cd include/opie &&  ln -sf ../../libopie/pim/*.h .; )
         ( cd include/opie; for generatedHeader in `cd ../../libopie; ls *.ui | sed -e "s,\.ui,\.h,g"`; do \
         ln -sf ../../libopie/$$generatedHeader $$generatedHeader; done )
         ln -sf ../../library/custom.h $(TOPDIR)/include/qpe/custom.h
         ( cd include/qpe; ln -sf ../../x11/libqpe-x11/qpe/*.h .; )
         touch $@
         
 $(TOPDIR)/library/custom.h : $(TOPDIR)/.config
         @-rm -f $@
         @$(if $(patsubst "%",%,$(CONFIG_CUSTOMFILE)),\
                 ln -sf $(patsubst "%",%,$(CONFIG_CUSTOMFILE)) $@)
         @touch $@
 
 $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf $(TOPDIR)/scripts/kconfig/conf $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/qmake/qmake:
         @$(call descend,$(shell dirname $@),$(shell basename $@))
 
 menuconfig: $(TOPDIR)/scripts/lxdialog/lxdialog $(TOPDIR)/scripts/kconfig/mconf ./config.in
         $(TOPDIR)/scripts/kconfig/mconf ./config.in
         @touch ./.config.stamp
 
 xconfig: $(TOPDIR)/scripts/kconfig/qconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
         $(TOPDIR)/scripts/kconfig/qconf ./config.in
         @touch .config.stamp
 
 gconfig: $(TOPDIR)/scripts/kconfig/gconf $(TOPDIR)/scripts/kconfig/libkconfig.so ./config.in
         $(TOPDIR)/scripts/kconfig/gconf ./config.in
         @touch .config.stamp
 
 config: $(TOPDIR)/scripts/kconfig/conf ./config.in
         $(TOPDIR)/scripts/kconfig/conf ./config.in
         @touch .config.stamp
  
 oldconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
         $(TOPDIR)/scripts/kconfig/conf -o ./config.in
         @touch .config.stamp
  
 randconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
         $(TOPDIR)/scripts/kconfig/conf -r ./config.in
         @touch .config.stamp
  
 allyesconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
         $(TOPDIR)/scripts/kconfig/conf -y ./config.in
         @touch .config.stamp
  
 allnoconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
         $(TOPDIR)/scripts/kconfig/conf -n ./config.in
         @touch .config.stamp
  
 defconfig: $(TOPDIR)/scripts/kconfig/conf ./config.in
         $(TOPDIR)/scripts/kconfig/conf -d ./config.in
         @touch .config.stamp
 
 $(TOPDIR)/qmake/qmake : $(TOPDIR)/mkspecs/default
 
 $(TOPDIR)/mkspecs/default :
         ln -sf linux-g++ $@
 
 $(TOPDIR)/scripts/subst : force
         @( \
                 echo 's,\$$QPE_VERSION,$(QPE_VERSION),g'; \
                 echo 's,\$$OPIE_VERSION,$(OPIE_VERSION),g'; \
                 echo 's,\$$QTE_VERSION,$(QTE_VERSION),g'; \
                 echo 's,\$$QTE_REVISION,$(QTE_REVISION),g'; \
                 echo 's,\$$SUB_VERSION,$(SUB_VERSION),g'; \
                 echo 's,\$$EXTRAVERSION,$(EXTRAVERSION),g'; \
                 echo 's,\$$QTE_BASEVERSION,$(QTE_BASEVERSION),g'; \
         ) > $@ || ( rm -f $@; exit 1 )
 
 $(TOPDIR)/scripts/filesubst : force
         @( \
                 echo 's,\$$OPIEDIR/root/,/,g'; \
                 echo 's,$(OPIEDIR)/root/,/,g'; \
                 echo 's,\$$OPIEDIR,$(prefix),g'; \
                 echo 's,$(OPIEDIR),$(prefix),g'; \
                 echo 's,\$$QTDIR,$(prefix),g'; \
                 echo 's,$(QTDIR),$(prefix),g'; \
                 echo 's,^\(\./\)*root/,/,g'; \
                 echo 's,^\(\./\)*etc/,$(prefix)/etc/,g'; \
                 echo 's,^\(\./\)*lib/,$(prefix)/lib/,g'; \
                 echo 's,^\(\./\)*bin/,$(prefix)/bin/,g'; \
                 echo 's,^\(\./\)*pics/,$(prefix)/pics/,g'; \
                 echo 's,^\(\./\)*sounds/,$(prefix)/sounds/,g'; \
                 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
                 echo 's,^\(\./\)*plugins/,$(prefix)/plugins/,g'; \
                 echo 's,^\(\./\)*apps/,$(prefix)/apps/,g'; \
                 echo 's,^\(\./\)*share/,$(prefix)/share/,g'; \
                 echo 's,^\(\./\)*i18n/,$(prefix)/i18n/,g'; \
                 echo 's,^\(\./\)*help/,$(prefix)/help/,g'; \
         ) > $@ || ( rm -f $@; exit 1 )
 
 ## general rules ##
 
 define descend
         $(MAKE) $(if $(QMAKE),QMAKE=$(QMAKE)) -C $(1) $(2)
 endef
 
 define makefilegen
                 cd $(if $(1),$(shell dirname $(1))); $(TOPDIR)/qmake/qmake $(3) -o $(if $(1),$(shell basename $(1))) `cat $(OPIEDIR)/packages | grep "  \`echo $(1)|sed -e 's,/Makefile$$,,'\`" | \
                 head -1 | awk '{print $$3}'`
 endef
 
 define makecfg
         $(TOPDIR)/scripts/makecfg.pl $1 $(OPIEDIR)
 endef
diff --git a/noncore/applets/memoryapplet/memoryapplet.pro b/noncore/applets/memoryapplet/memoryapplet.pro
new file mode 100644
index 0000000..eafabce
--- a/dev/null
+++ b/noncore/applets/memoryapplet/memoryapplet.pro
@@ -0,0 +1,24 @@
+TEMPLATE    = lib
+CONFIG      += qt plugin warn_on release
+HEADERS     = ../../apps/sysinfo/graph.h \
+            ../../apps/sysinfo/load.h  \
+            ../../apps/sysinfo/memory.h  \
+            memoryappletimpl.h  \
+            memorymeter.h  \
+            memorystatus.h \
+            swapfile.h
+SOURCES     = ../../apps/sysinfo/graph.cpp \
+            ../../apps/sysinfo/load.cpp \
+            ../../apps/sysinfo/memory.cpp \
+            memoryappletimpl.cpp  \
+            memorymeter.cpp \
+            memorystatus.cpp \
+            swapfile.cpp
+TARGET      = memoryapplet
+DESTDIR     = $(OPIEDIR)/plugins/applets
+INCLUDEPATH += $(OPIEDIR)/include
+DEPENDPATH  += ../$(OPIEDIR)/include
+VERSION     = 1.0.0
+LIBS        += -lqpe -lopie
+
+include ( $(OPIEDIR)/include.pro )
diff --git a/packages b/packages
index 7fac4f0..c48eee8 100644
--- a/packages
+++ b/packages
@@ -1,183 +1,191 @@
         CONFIG_ADDRESSBOOK      core/pim/addressbookaddressbook.pro
         CONFIG_ADVANCEDFM       noncore/apps/advancedfmadvancedfm.pro
         CONFIG_APPEARANCE2      noncore/settings/appearance2appearance2.pro
         CONFIG_APPSKEY  noncore/settings/appskeyappskey.pro
         CONFIG_AQPKG    noncore/apps/aqpkgaqpkg.pro
         CONFIG_BACKGAMMONnoncore/games/backgammon backgammon.pro
         CONFIG_BACKUP   noncore/settings/backupbackup.pro
         CONFIG_BATTERYAPPLET    core/applets/batteryappletbatteryapplet.pro
         CONFIG_BEND     noncore/mail/bendbend.pro
         CONFIG_BINARY   noncore/tools/calc2/binarybinary.pro
         CONFIG_BLUE-PIN         noncore/net/opietooth/blue-pinblue-pin.pro
         CONFIG_BOUNCE   noncore/games/bouncebounce.pro
         CONFIG_BUTTON-SETTINGS  core/settings/buttonbutton.pro
         CONFIG_BUZZWORD         noncore/games/buzzwordbuzzword.pro
         CONFIG_CALC2    noncore/tools/calc2calc.pro
         CONFIG_CALCULATOR       noncore/tools/calculatorcalculator.pro
         CONFIG_CALIBRATE        core/apps/calibratecalibrate.pro
         CONFIG_CAMERA   noncore/multimedia/cameracamera.pro
         CONFIG_CARDMON  core/applets/cardmoncardmon.pro
         CONFIG_CHECKBOOK        noncore/apps/checkbookcheckbook.pro
         CONFIG_CITYTIME         core/settings/citytimecitytime.pro
         CONFIG_CLIPBOARDAPPLET  core/applets/clipboardappletclipboardapplet.pro
         CONFIG_CLOCK    noncore/tools/clockclock.pro
         CONFIG_CLOCKAPPLET      core/applets/clockappletclockapplet.pro
         CONFIG_CONFEDIT         noncore/apps/confeditconfedit.pro
         CONFIG_DASHER   inputmethods/dasherdasher.pro
         CONFIG_DATEBOOK         core/pim/datebookdatebook.pro
         CONFIG_DECO_FLAT        noncore/decorations/flatflat.pro
         CONFIG_DECO_LIQUID      noncore/decorations/liquidliquid.pro
         CONFIG_DECO_POLISHED    noncore/decorations/polishedpolished.pro
         CONFIG_DICTIONARY       noncore/apps/dictionarydictionary.pro
         CONFIG_DRAWPAD  noncore/graphics/drawpaddrawpad.pro
         CONFIG_DVORAK   inputmethods/dvorakdvorak.pro
         CONFIG_EMBEDDEDKONSOLE  core/apps/embeddedkonsoleembeddedkonsole.pro
         CONFIG_EUROCONV         noncore/tools/euroconv/ euroconv.pro
         CONFIG_FIFTEEN  noncore/games/fifteenfifteen.pro
         CONFIG_FILEBROWSER      core/apps/filebrowserfilebrowser.pro
         CONFIG_FLAT     noncore/styles/flatflat.pro
         CONFIG_FORMATTER        noncore/tools/formatterformatter.pro
         CONFIG_FREETYPE         freetypefreetype.pro
         CONFIG_FRESH    noncore/styles/freshfresh.pro
         CONFIG_FTPLIB   noncore/net/ftplibftplib.pro
         CONFIG_GO       noncore/games/gogo.pro
         CONFIG_GSMTOOL  noncore/comm/gsmtoolgsmtool.pro
         CONFIG_HANDWRITING      inputmethods/handwritinghandwriting.pro
         CONFIG_HELPBROWSER      core/apps/helpbrowserhelpbrowser.pro
         CONFIG_HOMEAPPLET       core/applets/homeapplethomeapplet.pro
         CONFIG_INTERFACES       noncore/settings/networksettings/interfacesinterfaces.pro
         CONFIG_IRDAAPPLET       core/applets/irdaappletirdaapplet.pro
         CONFIG_JUMPX    inputmethods/jumpxjumpx.pro
         CONFIG_KBILL    noncore/games/kbillkbill.pro
         CONFIG_KCHECKERS        noncore/games/kcheckerskcheckers.pro
         CONFIG_KEYBOARD         inputmethods/keyboardkeyboard.pro
         CONFIG_KEYPEBBLE        noncore/comm/keypebblekeypebble.pro
         CONFIG_KEYVIEW  development/keyviewkeyview.pro
         CONFIG_KJUMPX   inputmethods/kjumpxkjumpx.pro
         CONFIG_KPACMAN  noncore/games/kpacmankpacman.pro
         CONFIG_LANGUAGE         noncore/settings/languagelanguage.pro
         CONFIG_LAUNCHER-SETTINGS        core/settings/launcherlauncher.pro
         CONFIG_LAUNCHER_CORE    core/launcherserver.pro
         CONFIG_LIBFFMPEG        core/multimedia/opieplayer/libffmpeglibffmpeg.pro
         CONFIG_LIBFLASH         core/multimedia/opieplayer/libflashlibflash.pro
 CONFIG_LIBKATE  noncore/apps/tinykate/libkate libkate.pro
         CONFIG_LIBMAD   core/multimedia/opieplayer/libmadlibmad.pro
         CONFIG_LIBMAIL  noncore/mail/libmaillibmail.pro
         CONFIG_LIBMPEG3         core/multimedia/opieplayer/libmpeg3libmpeg3.pro
         CONFIG_LIBOPIE  libopielibopie.pro
         CONFIG_LIBOPIE2CORE     libopie2/opiecoreopiecore.pro
         CONFIG_LIBOPIE2DB       libopie2/opiedbopiedb.pro
         CONFIG_LIBOPIE2EXAMPLES         libopie2/examplesexamples.pro
         CONFIG_LIBOPIE2NET      libopie2/opienetopienet.pro
         CONFIG_LIBOPIE2PIM      libopie2/opiepimopiepim.pro
         CONFIG_LIBOPIE2UI       libopie2/opieuiopieui.pro
         CONFIG_LIBOPIE2MM       libopie2/opiemmopiemm.pro
         CONFIG_LIBOPIETOOTH     noncore/net/opietooth/liblib.pro
         CONFIG_LIBOPIE_PIM      libopie/pimpim.pro
         CONFIG_LIBQPE   librarylibrary.pro
         CONFIG_LIBQPE-X11       x11/libqpe-x11libqpe-x11.pro
         CONFIG_LIBSQL   libsqllibsql.pro
 CONFIG_LIBTREMOR core/multimedia/opieplayer/vorbis/tremor tremor.pro
 CONFIG_LIBTREMORPLUGIN core/multimedia/opieplayer/vorbis libtremor.pro
         CONFIG_LIGHT-AND-POWER  core/settings/light-and-powerlight-and-power.pro
         CONFIG_LIQUID   noncore/styles/liquidliquid.pro
         CONFIG_LOGOUTAPPLET     core/applets/logoutappletlogoutapplet.pro
         CONFIG_MAILIT           noncore/net/mailit      mailit.pro
         CONFIG_MEDIUMMOUNT      noncore/settings/mediummountmediummount.pro
+        CONFIG_MEMORYAPPLET     noncore/applets/memoryappletmemoryapplet.pro
         CONFIG_METAL    noncore/styles/metalmetal.pro
         CONFIG_MINDBREAKER      noncore/games/mindbreakermindbreaker.pro
         CONFIG_MINESWEEP        noncore/games/minesweepminesweep.pro
         CONFIG_MOBILEMSG        noncore/comm/mobilemsgmobilemsg.pro
         CONFIG_MODPLUG  core/multimedia/opieplayer/modplugmodplug.pro
         CONFIG_MULTIKEY         inputmethods/multikeymultikey.pro
         CONFIG_NETSYSTEMTIME    noncore/settings/netsystemtimenetsystemtime.pro
         CONFIG_NETWORKAPPLET    noncore/applets/networkappletnetworkapplet.pro
         CONFIG_NETWORKSETUP     noncore/settings/networksettingsnetworksettings.pro
         CONFIG_NOTESAPPLET      noncore/applets/notesappletnotesapplet.pro
         CONFIG_OAPP     core/apps/oappoapp.pro
         CONFIG_OBEX     core/applets/obex2obex.pro
         CONFIG_ODICT    noncore/apps/odictodict.pro
         CONFIG_OIPKG    core/apps/oipkgoipkg.pro
         CONFIG_OPIE-CONSOLE     noncore/apps/opie-consoleopie-console.pro
         CONFIG_OPIE-LOGIN       core/opie-loginopie-login.pro
         CONFIG_OPIE-READER      noncore/apps/opie-readeropie-reader.pro
         CONFIG_OPIE-SH  noncore/tools/opie-shopie-sh.pro
         CONFIG_OPIE-SHEET       noncore/apps/opie-sheetopie-sheet.pro
         CONFIG_OPIE-WRITE       noncore/apps/opie-writeopie-write.pro
         CONFIG_OPIEALARMcore/opiealarm
         CONFIG_OPIEFTP  noncore/net/opieftpopieftp.pro
         CONFIG_OPIEIRC  noncore/net/opieircopieirc.pro
         CONFIG_OPIEMAIL2noncore/mail mail.pro
         CONFIG_OPIEPLAYER       core/multimedia/opieplayeropieplayer.pro
         CONFIG_OPIEPLAYER2      noncore/multimedia/opieplayer2opieplayer2.pro
         CONFIG_OPIE-RDESKTOP    noncore/net/opierdesktopopierdesktop.pro
         CONFIG_OPIEREC          noncore/multimedia/opierecopierec.pro
         CONFIG_OPIETOOTH-APPLET         noncore/net/opietooth/appletapplet.pro
         CONFIG_OPIETOOTH-MANAGER        noncore/net/opietooth/managermanager.pro
         CONFIG_OSEARCH  core/pim/osearchosearch.pro
         CONFIG_OXYGEN   noncore/apps/oxygenoxygen.pro
         CONFIG_PARASHOOT        noncore/games/parashootparashoot.pro
         CONFIG_PICKBOARD        inputmethods/pickboardpickboard.pro
         CONFIG_QASTEROIDS       noncore/games/qasteroidsqasteroids.pro
         CONFIG_QCOP     core/apps/qcopqcop.pro
         CONFIG_QPDF     noncore/graphics/qpdfqpdf.pro
-        CONFIG_QUICKEXEC        quickexecquickexec.pro
+        CONFIG_QPDF2    noncore/graphics/qpdf2qpdf2.pro
+CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
         CONFIG_QWS      core/qwsqws.pro
         CONFIG_REMOTE   noncore/tools/remoteremote.pro
         CONFIG_RESTARTAPPLET    core/applets/restartappletrestartapplet.pro
         CONFIG_RESTARTAPPLET2   core/applets/restartapplet2restartapplet2.pro
         CONFIG_ROTATEAPPLET     core/applets/rotateappletrotateapplet.pro
         CONFIG_ROTATION         noncore/settings/rotationrotation.pro
         CONFIG_RUNAPPLET        core/applets/runappletrunapplet.pro
         CONFIG_SCREENSHOTAPPLET         core/applets/screenshotappletscreenshotapplet.pro
         CONFIG_SECURITY         core/settings/securitysecurity.pro
         CONFIG_SFCAVE   noncore/games/sfcavesfcave.pro
         CONFIG_SFCAVE-SDL       noncore/games/sfcave-sdlsfcave-sdl.pro
         CONFIG_SHOWIMG  noncore/multimedia/showimgshowimg.pro
         CONFIG_SIMPLE   noncore/tools/calc2/simplesimple.pro
         CONFIG_SINGLE   singlesingle.pro
         CONFIG_SNAKE    noncore/games/snakesnake.pro
         CONFIG_SOLITAIRE        noncore/games/solitairesolitaire.pro
         CONFIG_SOUND    noncore/settings/soundsound.pro
         CONFIG_SSHKEYS  noncore/settings/sshkeyssshkeys.pro
         CONFIG_SUSPENDAPPLET    core/applets/suspendappletsuspendapplet.pro
         CONFIG_SYSINFO  noncore/apps/sysinfosysinfo.pro
         CONFIG_TABLEVIEWER      noncore/apps/tableviewertableviewer.pro
         CONFIG_TABMANAGER       noncore/settings/tabmanagertabmanager.pro
         CONFIG_TABOAPP  core/apps/taboapptaboapp.pro
         CONFIG_TEST     libsql/testtest.pro
         CONFIG_TEST     noncore/apps/opie-console/testtest.pro
         CONFIG_TETRIX   noncore/games/tetrixtetrix.pro
         CONFIG_TEXTEDIT         core/apps/textedittextedit.pro
         CONFIG_THEME    noncore/styles/themetheme.pro
         CONFIG_TICTAC   noncore/games/tictactictac.pro
         CONFIG_TINYKATE noncore/apps/tinykatetinykate.pro
         CONFIG_TODAY    core/pim/todaytoday.pro
 CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro
         CONFIG_TODAY_DATEBOOK   core/pim/today/plugins/datebookdatebook.pro
         CONFIG_TODAY_FORTUNE    noncore/todayplugins/fortunefortune.pro
         CONFIG_TODAY_MAIL       core/pim/today/plugins/mailmail.pro
         CONFIG_TODAY_STOCKTICKER        noncore/todayplugins/stockticker/stocktickerstockticker.pro
         CONFIG_TODAY_STOCKTICKERLIB     noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
         CONFIG_TODAY_TODOLIST   core/pim/today/plugins/todolisttodolist.pro
         CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro
         CONFIG_TODO     core/pim/todotodo.pro
         CONFIG_UBROWSER         noncore/net/ubrowserubrowser.pro
         CONFIG_UNIKEYBOARD      inputmethods/unikeyboardunikeyboard.pro
         CONFIG_USERMANAGER      noncore/settings/usermanagerusermanager.pro
         CONFIG_VMEMO    core/applets/vmemovmemo.pro
         CONFIG_VOLUMEAPPLET     core/applets/volumeappletvolumeapplet.pro
         CONFIG_VTAPPLET         core/applets/vtappletvtapplet.pro
         CONFIG_WAVPLUGIN        core/multimedia/opieplayer/wavpluginwavplugin.pro
         CONFIG_WELLENREITER     noncore/net/wellenreiterwellenreiter.pro
         CONFIG_WIRELESSAPPLET   noncore/applets/wirelessappletwirelessapplet.pro
         CONFIG_WLAN     noncore/settings/networksettings/wlanwlan.pro
         CONFIG_PPP      noncore/settings/networksettings/pppppp.pro
         CONFIG_WORDGAME         noncore/games/wordgamewordgame.pro
         CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro
         CONFIG_MAIN_TAB_EXAMPLE         examples/main-tabexample.pro
         CONFIG_SIMPLE_EXAMPLE   examples/simpleexample.pro
         CONFIG_SIMPLE_ICON      examples/simple-iconexample.pro
         CONFIG_SIMPLE_MAIN      examples/simple-mainexample.pro
+<<<<<<< packages
+        CONFIG_SIMPLE_PIM       examples/simple-pimexample.pro
+CONFIG_BIGSCREEN_EXAMPLE       libopie/big-screen/example      osplitter_mail.pro
+
+=======
         CONFIG_SIMPLE_PIM       examples/simple-pimexample.pro
         CONFIG_APPLET_EXAMPLE   examples/appletexample.pro
+>>>>>>> 1.56