summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-11-24 08:02:34 (UTC)
committer llornkcor <llornkcor>2003-11-24 08:02:34 (UTC)
commit525bea7de3edaf3c9b5851d24fc83823168f7a6b (patch) (side-by-side diff)
tree611cf52ea0f37e92c7600b2ff6ca728cc527fa6d
parent1d847b149d6239081338c9680910cbc353bcc0c6 (diff)
downloadopie-525bea7de3edaf3c9b5851d24fc83823168f7a6b.zip
opie-525bea7de3edaf3c9b5851d24fc83823168f7a6b.tar.gz
opie-525bea7de3edaf3c9b5851d24fc83823168f7a6b.tar.bz2
please watchout for commiting unresolved conflicts
Diffstat (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
@@ -162,32 +162,27 @@ CONFIG_TODAY_DATEBOOK core/pim/today/plugins/datebook datebook.pro
CONFIG_TODAY_FORTUNE noncore/todayplugins/fortune fortune.pro
CONFIG_TODAY_MAIL core/pim/today/plugins/mail mail.pro
CONFIG_TODAY_STOCKTICKER noncore/todayplugins/stockticker/stockticker stockticker.pro
CONFIG_TODAY_STOCKTICKERLIB noncore/todayplugins/stockticker/stocktickerlib stocktickerlib.pro
CONFIG_TODAY_TODOLIST core/pim/today/plugins/todolist todolist.pro
CONFIG_TODAY_WEATHER noncore/todayplugins/weather weather.pro
CONFIG_TODO core/pim/todo todo.pro
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