1 files changed, 9 insertions, 1 deletions

diff --git a/packages b/packages
index 7fac4f0..c48eee8 100644
--- a/packages
+++ b/packages
@@ -86,2 +86,3 @@ 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
@@ -123,3 +124,4 @@ CONFIG_QCOP	core/apps/qcop	qcop.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
@@ -181,3 +183,9 @@ CONFIG_SIMPLE_ICON	examples/simple-icon	example.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