summaryrefslogtreecommitdiff
path: root/packages
Side-by-side diff
Diffstat (limited to 'packages') (more/less context) (ignore whitespace changes)
-rw-r--r--packages5
1 files changed, 0 insertions, 5 deletions
diff --git a/packages b/packages
index 0ff1c90..5a6b683 100644
--- a/packages
+++ b/packages
@@ -170,24 +170,19 @@ CONFIG_UBROWSER noncore/net/ubrowser ubrowser.pro
CONFIG_UNIKEYBOARD inputmethods/unikeyboard unikeyboard.pro
CONFIG_USERMANAGER noncore/settings/usermanager usermanager.pro
CONFIG_VMEMO core/applets/vmemo vmemo.pro
CONFIG_VOLUMEAPPLET core/applets/volumeapplet volumeapplet.pro
CONFIG_VTAPPLET core/applets/vtapplet vtapplet.pro
CONFIG_WAVPLUGIN core/multimedia/opieplayer/wavplugin wavplugin.pro
CONFIG_WELLENREITER noncore/net/wellenreiter wellenreiter.pro
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