summaryrefslogtreecommitdiff
authorllornkcor <llornkcor>2003-11-24 08:02:34 (UTC)
committer llornkcor <llornkcor>2003-11-24 08:02:34 (UTC)
commit525bea7de3edaf3c9b5851d24fc83823168f7a6b (patch) (unidiff)
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
@@ -154,40 +154,35 @@ CONFIG_TEST noncore/apps/opie-console/test test.pro
154 CONFIG_TETRIX noncore/games/tetrixtetrix.pro 154 CONFIG_TETRIX noncore/games/tetrixtetrix.pro
155 CONFIG_TEXTEDIT core/apps/textedittextedit.pro 155 CONFIG_TEXTEDIT core/apps/textedittextedit.pro
156 CONFIG_THEME noncore/styles/themetheme.pro 156 CONFIG_THEME noncore/styles/themetheme.pro
157 CONFIG_TICTAC noncore/games/tictactictac.pro 157 CONFIG_TICTAC noncore/games/tictactictac.pro
158 CONFIG_TINYKATE noncore/apps/tinykatetinykate.pro 158 CONFIG_TINYKATE noncore/apps/tinykatetinykate.pro
159 CONFIG_TODAY core/pim/todaytoday.pro 159 CONFIG_TODAY core/pim/todaytoday.pro
160CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro 160CONFIG_TODAY_ADDRESSBOOK core/pim/today/plugins/addressbook addressbook.pro
161 CONFIG_TODAY_DATEBOOK core/pim/today/plugins/datebookdatebook.pro 161 CONFIG_TODAY_DATEBOOK core/pim/today/plugins/datebookdatebook.pro
162 CONFIG_TODAY_FORTUNE noncore/todayplugins/fortunefortune.pro 162 CONFIG_TODAY_FORTUNE noncore/todayplugins/fortunefortune.pro
163 CONFIG_TODAY_MAIL core/pim/today/plugins/mailmail.pro 163 CONFIG_TODAY_MAIL core/pim/today/plugins/mailmail.pro
164 CONFIG_TODAY_STOCKTICKER noncore/todayplugins/stockticker/stocktickerstockticker.pro 164 CONFIG_TODAY_STOCKTICKER noncore/todayplugins/stockticker/stocktickerstockticker.pro
165 CONFIG_TODAY_STOCKTICKERLIB noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro 165 CONFIG_TODAY_STOCKTICKERLIB noncore/todayplugins/stockticker/stocktickerlibstocktickerlib.pro
166 CONFIG_TODAY_TODOLIST core/pim/today/plugins/todolisttodolist.pro 166 CONFIG_TODAY_TODOLIST core/pim/today/plugins/todolisttodolist.pro
167 CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro 167 CONFIG_TODAY_WEATHERnoncore/todayplugins/weather weather.pro
168 CONFIG_TODO core/pim/todotodo.pro 168 CONFIG_TODO core/pim/todotodo.pro
169 CONFIG_UBROWSER noncore/net/ubrowserubrowser.pro 169 CONFIG_UBROWSER noncore/net/ubrowserubrowser.pro
170 CONFIG_UNIKEYBOARD inputmethods/unikeyboardunikeyboard.pro 170 CONFIG_UNIKEYBOARD inputmethods/unikeyboardunikeyboard.pro
171 CONFIG_USERMANAGER noncore/settings/usermanagerusermanager.pro 171 CONFIG_USERMANAGER noncore/settings/usermanagerusermanager.pro
172 CONFIG_VMEMO core/applets/vmemovmemo.pro 172 CONFIG_VMEMO core/applets/vmemovmemo.pro
173 CONFIG_VOLUMEAPPLET core/applets/volumeappletvolumeapplet.pro 173 CONFIG_VOLUMEAPPLET core/applets/volumeappletvolumeapplet.pro
174 CONFIG_VTAPPLET core/applets/vtappletvtapplet.pro 174 CONFIG_VTAPPLET core/applets/vtappletvtapplet.pro
175 CONFIG_WAVPLUGIN core/multimedia/opieplayer/wavpluginwavplugin.pro 175 CONFIG_WAVPLUGIN core/multimedia/opieplayer/wavpluginwavplugin.pro
176 CONFIG_WELLENREITER noncore/net/wellenreiterwellenreiter.pro 176 CONFIG_WELLENREITER noncore/net/wellenreiterwellenreiter.pro
177 CONFIG_WIRELESSAPPLET noncore/applets/wirelessappletwirelessapplet.pro 177 CONFIG_WIRELESSAPPLET noncore/applets/wirelessappletwirelessapplet.pro
178 CONFIG_WLAN noncore/settings/networksettings/wlanwlan.pro 178 CONFIG_WLAN noncore/settings/networksettings/wlanwlan.pro
179 CONFIG_PPP noncore/settings/networksettings/pppppp.pro 179 CONFIG_PPP noncore/settings/networksettings/pppppp.pro
180 CONFIG_WORDGAME noncore/games/wordgamewordgame.pro 180 CONFIG_WORDGAME noncore/games/wordgamewordgame.pro
181 CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro 181 CONFIG_ZSAFEnoncore/apps/zsafe zsafe.pro
182 CONFIG_MAIN_TAB_EXAMPLE examples/main-tabexample.pro 182 CONFIG_MAIN_TAB_EXAMPLE examples/main-tabexample.pro
183 CONFIG_SIMPLE_EXAMPLE examples/simpleexample.pro 183 CONFIG_SIMPLE_EXAMPLE examples/simpleexample.pro
184 CONFIG_SIMPLE_ICON examples/simple-iconexample.pro 184 CONFIG_SIMPLE_ICON examples/simple-iconexample.pro
185 CONFIG_SIMPLE_MAIN examples/simple-mainexample.pro 185 CONFIG_SIMPLE_MAIN examples/simple-mainexample.pro
186<<<<<<< packages
187 CONFIG_SIMPLE_PIM examples/simple-pimexample.pro 186 CONFIG_SIMPLE_PIM examples/simple-pimexample.pro
188CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro 187CONFIG_BIGSCREEN_EXAMPLE libopie/big-screen/example osplitter_mail.pro
189
190=======
191 CONFIG_SIMPLE_PIM examples/simple-pimexample.pro
192 CONFIG_APPLET_EXAMPLE examples/appletexample.pro 188 CONFIG_APPLET_EXAMPLE examples/appletexample.pro
193>>>>>>> 1.56