summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-18 21:01:35 (UTC)
committer kergoth <kergoth>2002-03-18 21:01:35 (UTC)
commit88945f832c9dcc9b7257ae451f29f8c0a678ffef (patch) (unidiff)
tree6b1ac2931e7a3fffa8f1fa285cd2434ec84745a8
parentbc489f8c0738dcc6cb3dc31edc5bda28c7034456 (diff)
downloadopie-88945f832c9dcc9b7257ae451f29f8c0a678ffef.zip
opie-88945f832c9dcc9b7257ae451f29f8c0a678ffef.tar.gz
opie-88945f832c9dcc9b7257ae451f29f8c0a678ffef.tar.bz2
fixing package conflicts.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--apps/Applications/drawpad.desktop2
-rw-r--r--apps/Applications/today.desktop2
-rw-r--r--apps/Games/tictac.desktop2
-rw-r--r--pics/drawpad/DrawPad.png (renamed from pics/DrawPad.png)bin2299 -> 2299 bytes
-rw-r--r--pics/tictac/Tictac.png (renamed from pics/Tictac.png)bin997 -> 997 bytes
-rw-r--r--pics/today/today_icon.png (renamed from pics/today_icon.png)bin2071 -> 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
@@ -1,6 +1,6 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=A Drawing Program 2Comment=A Drawing Program
3Exec=drawpad 3Exec=drawpad
4Icon=DrawPad 4Icon=drawpad/DrawPad
5Type=Application 5Type=Application
6Name=DrawPad 6Name=DrawPad
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
@@ -1,7 +1,7 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=Today App 2Comment=Today App
3Exec=today 3Exec=today
4Icon=today_icon 4Icon=today/today_icon
5Type=Application 5Type=Application
6Name=Today 6Name=Today
7Name[pt_BR]=Hoje 7Name[pt_BR]=Hoje
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
@@ -1,6 +1,6 @@
1[Desktop Entry] 1[Desktop Entry]
2Exec=tictac 2Exec=tictac
3Icon=Tictac 3Icon=tictac/Tictac
4Type=Application 4Type=Application
5Name=Tictac 5Name=Tictac
6Name[pt_BR]=Jogo da Velha 6Name[pt_BR]=Jogo da Velha
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