| author | kergoth <kergoth> | 2002-03-18 21:09:53 (UTC) |
|---|---|---|
| committer | kergoth <kergoth> | 2002-03-18 21:09:53 (UTC) |
| commit | 29628f9eaa9f2436d8f590c014bb41d35c8cf65f (patch) (unidiff) | |
| tree | f63459ec82472076ffcc079dfecebe35fc3a9118 | |
| parent | 88945f832c9dcc9b7257ae451f29f8c0a678ffef (diff) | |
| download | opie-29628f9eaa9f2436d8f590c014bb41d35c8cf65f.zip opie-29628f9eaa9f2436d8f590c014bb41d35c8cf65f.tar.gz opie-29628f9eaa9f2436d8f590c014bb41d35c8cf65f.tar.bz2 | |
Fixing package conflicts.
| -rw-r--r-- | core/pim/today/opie-today.control | 2 | ||||
| -rw-r--r-- | noncore/games/tictac/opie-tictac.control | 2 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/opie-drawpad.control | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/core/pim/today/opie-today.control b/core/pim/today/opie-today.control index d99d92b..e3734d3 100644 --- a/core/pim/today/opie-today.control +++ b/core/pim/today/opie-today.control | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | Files: bin/today apps/Applications/today.desktop pics/today/today_logo.png pics/today/config.png pics/today/mail.png | 1 | Files: bin/today apps/Applications/today.desktop pics/today/today_logo.png pics/today/config.png pics/today/mail.png pics/today/today_icon.png |
| 2 | Priority: optional | 2 | Priority: optional |
diff --git a/noncore/games/tictac/opie-tictac.control b/noncore/games/tictac/opie-tictac.control index aee2c96..21a6bb4 100644 --- a/noncore/games/tictac/opie-tictac.control +++ b/noncore/games/tictac/opie-tictac.control | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | Files: bin/tictac apps/Games/tictac.desktop pics/Tictac.png | 1 | Files: bin/tictac apps/Games/tictac.desktop pics/tictac/Tictac.png |
| 2 | Package: opie-tictac | 2 | Package: opie-tictac |
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control index a37a46d..6846f2f 100644 --- a/noncore/graphics/drawpad/opie-drawpad.control +++ b/noncore/graphics/drawpad/opie-drawpad.control | |||
| @@ -1,2 +1,2 @@ | |||
| 1 | Files: bin/drawpad apps/Applications/drawpad.desktop pics/drawpad | 1 | Files: bin/drawpad apps/Applications/drawpad.desktop pics/drawpad pics/drawpad/DrawPad.png |
| 2 | Package: opie-drawpad | 2 | Package: opie-drawpad |