summaryrefslogtreecommitdiff
path: root/packages
Side-by-side diff
Diffstat (limited to 'packages') (more/less context) (ignore whitespace changes)
-rw-r--r--packages10
1 files changed, 9 insertions, 1 deletions
diff --git a/packages b/packages
index 7fac4f0..c48eee8 100644
--- a/packages
+++ b/packages
@@ -79,16 +79,17 @@ CONFIG_LIBQPE-X11 x11/libqpe-x11 libqpe-x11.pro
CONFIG_LIBSQL libsql libsql.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-power light-and-power.pro
CONFIG_LIQUID noncore/styles/liquid liquid.pro
CONFIG_LOGOUTAPPLET core/applets/logoutapplet logoutapplet.pro
CONFIG_MAILIT noncore/net/mailit mailit.pro
CONFIG_MEDIUMMOUNT noncore/settings/mediummount mediummount.pro
+CONFIG_MEMORYAPPLET noncore/applets/memoryapplet memoryapplet.pro
CONFIG_METAL noncore/styles/metal metal.pro
CONFIG_MINDBREAKER noncore/games/mindbreaker mindbreaker.pro
CONFIG_MINESWEEP noncore/games/minesweep minesweep.pro
CONFIG_MOBILEMSG noncore/comm/mobilemsg mobilemsg.pro
CONFIG_MODPLUG core/multimedia/opieplayer/modplug modplug.pro
CONFIG_MULTIKEY inputmethods/multikey multikey.pro
CONFIG_NETSYSTEMTIME noncore/settings/netsystemtime netsystemtime.pro
CONFIG_NETWORKAPPLET noncore/applets/networkapplet networkapplet.pro
@@ -116,17 +117,18 @@ CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/applet applet.pro
CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/manager manager.pro
CONFIG_OSEARCH core/pim/osearch osearch.pro
CONFIG_OXYGEN noncore/apps/oxygen oxygen.pro
CONFIG_PARASHOOT noncore/games/parashoot parashoot.pro
CONFIG_PICKBOARD inputmethods/pickboard pickboard.pro
CONFIG_QASTEROIDS noncore/games/qasteroids qasteroids.pro
CONFIG_QCOP core/apps/qcop qcop.pro
CONFIG_QPDF noncore/graphics/qpdf qpdf.pro
-CONFIG_QUICKEXEC quickexec quickexec.pro
+CONFIG_QPDF2 noncore/graphics/qpdf2 qpdf2.pro
+CONFIG_QUICKLAUNCHER core/tools/quicklauncher quicklauncher.pro
CONFIG_QWS core/qws qws.pro
CONFIG_REMOTE noncore/tools/remote remote.pro
CONFIG_RESTARTAPPLET core/applets/restartapplet restartapplet.pro
CONFIG_RESTARTAPPLET2 core/applets/restartapplet2 restartapplet2.pro
CONFIG_ROTATEAPPLET core/applets/rotateapplet rotateapplet.pro
CONFIG_ROTATION noncore/settings/rotation rotation.pro
CONFIG_RUNAPPLET core/applets/runapplet runapplet.pro
CONFIG_SCREENSHOTAPPLET core/applets/screenshotapplet screenshotapplet.pro
@@ -174,10 +176,16 @@ CONFIG_WIRELESSAPPLET noncore/applets/wirelessapplet wirelessapplet.pro
CONFIG_WLAN noncore/settings/networksettings/wlan wlan.pro
CONFIG_PPP noncore/settings/networksettings/ppp ppp.pro
CONFIG_WORDGAME noncore/games/wordgame wordgame.pro
CONFIG_ZSAFE noncore/apps/zsafe zsafe.pro
CONFIG_MAIN_TAB_EXAMPLE examples/main-tab example.pro
CONFIG_SIMPLE_EXAMPLE examples/simple example.pro
CONFIG_SIMPLE_ICON examples/simple-icon example.pro
CONFIG_SIMPLE_MAIN examples/simple-main example.pro
+<<<<<<< packages
+CONFIG_SIMPLE_PIM examples/simple-pim example.pro
+CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro
+
+=======
CONFIG_SIMPLE_PIM examples/simple-pim example.pro
CONFIG_APPLET_EXAMPLE examples/applet example.pro
+>>>>>>> 1.56