author | kergoth <kergoth> | 2002-03-18 21:01:35 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2002-03-18 21:01:35 (UTC) |
commit | 88945f832c9dcc9b7257ae451f29f8c0a678ffef (patch) (unidiff) | |
tree | 6b1ac2931e7a3fffa8f1fa285cd2434ec84745a8 | |
parent | bc489f8c0738dcc6cb3dc31edc5bda28c7034456 (diff) | |
download | opie-88945f832c9dcc9b7257ae451f29f8c0a678ffef.zip opie-88945f832c9dcc9b7257ae451f29f8c0a678ffef.tar.gz opie-88945f832c9dcc9b7257ae451f29f8c0a678ffef.tar.bz2 |
fixing package conflicts.
-rw-r--r-- | apps/Applications/drawpad.desktop | 2 | ||||
-rw-r--r-- | apps/Applications/today.desktop | 2 | ||||
-rw-r--r-- | apps/Games/tictac.desktop | 2 | ||||
-rw-r--r-- | pics/drawpad/DrawPad.png (renamed from pics/DrawPad.png) | bin | 2299 -> 2299 bytes | |||
-rw-r--r-- | pics/tictac/Tictac.png (renamed from pics/Tictac.png) | bin | 997 -> 997 bytes | |||
-rw-r--r-- | pics/today/today_icon.png (renamed from pics/today_icon.png) | bin | 2071 -> 2071 bytes |
6 files changed, 3 insertions, 3 deletions
diff --git a/apps/Applications/drawpad.desktop b/apps/Applications/drawpad.desktop index 9286acf..831858b 100644 --- a/apps/Applications/drawpad.desktop +++ b/apps/Applications/drawpad.desktop | |||
@@ -3,3 +3,3 @@ Comment=A Drawing Program | |||
3 | Exec=drawpad | 3 | Exec=drawpad |
4 | Icon=DrawPad | 4 | Icon=drawpad/DrawPad |
5 | Type=Application | 5 | Type=Application |
diff --git a/apps/Applications/today.desktop b/apps/Applications/today.desktop index d8ae596..d28930c 100644 --- a/apps/Applications/today.desktop +++ b/apps/Applications/today.desktop | |||
@@ -3,3 +3,3 @@ Comment=Today App | |||
3 | Exec=today | 3 | Exec=today |
4 | Icon=today_icon | 4 | Icon=today/today_icon |
5 | Type=Application | 5 | Type=Application |
diff --git a/apps/Games/tictac.desktop b/apps/Games/tictac.desktop index e2ee7af..cd1c715 100644 --- a/apps/Games/tictac.desktop +++ b/apps/Games/tictac.desktop | |||
@@ -2,3 +2,3 @@ | |||
2 | Exec=tictac | 2 | Exec=tictac |
3 | Icon=Tictac | 3 | Icon=tictac/Tictac |
4 | Type=Application | 4 | Type=Application |
diff --git a/pics/DrawPad.png b/pics/drawpad/DrawPad.png index 6f3ebe9..6f3ebe9 100644 --- a/pics/DrawPad.png +++ b/pics/drawpad/DrawPad.png | |||
Binary files differ | |||
diff --git a/pics/Tictac.png b/pics/tictac/Tictac.png index da3555b..da3555b 100644 --- a/pics/Tictac.png +++ b/pics/tictac/Tictac.png | |||
Binary files differ | |||
diff --git a/pics/today_icon.png b/pics/today/today_icon.png index 62a120e..62a120e 100644 --- a/pics/today_icon.png +++ b/pics/today/today_icon.png | |||
Binary files differ | |||