| author | llornkcor <llornkcor> | 2003-11-24 08:02:34 (UTC) |
|---|---|---|
| committer | llornkcor <llornkcor> | 2003-11-24 08:02:34 (UTC) |
| commit | 525bea7de3edaf3c9b5851d24fc83823168f7a6b (patch) (side-by-side diff) | |
| tree | 611cf52ea0f37e92c7600b2ff6ca728cc527fa6d /packages | |
| parent | 1d847b149d6239081338c9680910cbc353bcc0c6 (diff) | |
| download | opie-525bea7de3edaf3c9b5851d24fc83823168f7a6b.zip opie-525bea7de3edaf3c9b5851d24fc83823168f7a6b.tar.gz opie-525bea7de3edaf3c9b5851d24fc83823168f7a6b.tar.bz2 | |
please watchout for commiting unresolved conflicts
| -rw-r--r-- | packages | 5 |
1 files changed, 0 insertions, 5 deletions
@@ -184,10 +184,5 @@ 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 |