summaryrefslogtreecommitdiff
authorkergoth <kergoth>2002-03-18 22:44:29 (UTC)
committer kergoth <kergoth>2002-03-18 22:44:29 (UTC)
commit5041129a9cba3222990fec42d0a96ceb660f9e86 (patch) (unidiff)
tree69b50ab0c9b196112c4294dd2ae15c52301135fe
parente7171ae513696f32a1edfeb41e22ff5b036c0460 (diff)
downloadopie-5041129a9cba3222990fec42d0a96ceb660f9e86.zip
opie-5041129a9cba3222990fec42d0a96ceb660f9e86.tar.gz
opie-5041129a9cba3222990fec42d0a96ceb660f9e86.tar.bz2
Fixing package conflicts.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--apps/Applications/opieftp.desktop2
-rw-r--r--pics/opieftp/opieftp.png (renamed from pics/opieftp.png)bin1586 -> 1586 bytes
2 files changed, 1 insertions, 1 deletions
diff --git a/apps/Applications/opieftp.desktop b/apps/Applications/opieftp.desktop
index 9c3f0f7..385b5a1 100644
--- a/apps/Applications/opieftp.desktop
+++ b/apps/Applications/opieftp.desktop
@@ -1,6 +1,6 @@
1[Desktop Entry] 1[Desktop Entry]
2Comment=An Ftp Client 2Comment=An Ftp Client
3Exec=opieftp 3Exec=opieftp
4Icon=opieftp 4Icon=opieftp/opieftp
5Type=Application 5Type=Application
6Name=OpieFtp 6Name=OpieFtp
diff --git a/pics/opieftp.png b/pics/opieftp/opieftp.png
index 5551197..5551197 100644
--- a/pics/opieftp.png
+++ b/pics/opieftp/opieftp.png
Binary files differ