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
@@ -180,14 +180,9 @@ CONFIG_PPP noncore/settings/networksettings/ppp ppp.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