For now trunk only: use the new icon everywhere, and mark the images as binary files

diff --git a/share/Makefile.am b/share/Makefile.am
index 00f5fb3e7b09615a2a9db2374adf77c65752f29f..141255324a20032efb937673ff0d000c8cff2028 100644 (file)
--- a/share/Makefile.am
+++ b/share/Makefile.am
@@ -9,6 +9,7 @@ dist_pkgdata_DATA = \
        $(DIST_icons16) \
        $(DIST_icons32) \
        $(DIST_icons48) \
+       $(DIST_icons128) \
        $(NULL)
 
 nobase_dist_pkgdata_DATA = \
@@ -28,7 +29,6 @@ DIST_rsrc = \
        vlc_wince_rc.rc \
        vlc_beos.rsrc \
        vlc_win32_rc.rc \
-       vlc-icons.xcf \
        $(NULL)
 
 DIST_pda = \
@@ -53,8 +53,13 @@ DIST_icons32 = \
        $(NULL)
 
 DIST_icons48 = \
-       vlc48x48new.ico \
+       vlc48x48.ico \
        vlc48x48.png \
+       vlc48x48.xpm \
+       $(NULL)
+
+DIST_icons128 = \
+       vlc128x128.png \
        $(NULL)
 
 DIST_skins2 = \

diff --git a/share/http/favicon.ico b/share/http/favicon.ico
index dfacdf5e80edb11fa995bb397680a63abe9efd0e..81c7197e956dd8b7d1abf633a926adb10da4eeb2 100644 (file)
Binary files a/share/http/favicon.ico and b/share/http/favicon.ico differ

diff --git a/share/vlc-icons.xcf b/share/vlc-icons.xcf
deleted file mode 100644 (file)
index af4ba1a..0000000
Binary files a/share/vlc-icons.xcf and /dev/null differ

diff --git a/share/vlc.icns b/share/vlc.icns
index b624528d944c729a8666e99267888697f2225730..0bf78c5a9e80cb0f7db0cab50ff4c41ccaf7c7cc 100644 (file)
Binary files a/share/vlc.icns and b/share/vlc.icns differ

diff --git a/share/vlc128x128.png b/share/vlc128x128.png
new file mode 100644 (file)
index 0000000..0fa907b
Binary files /dev/null and b/share/vlc128x128.png differ

diff --git a/share/vlc16x16.png b/share/vlc16x16.png
index b41a697f730c9e458f27c8894464812366271f65..ce7633e54ee4521bbaa710fc6119fd1e464c8122 100644 (file)
Binary files a/share/vlc16x16.png and b/share/vlc16x16.png differ

diff --git a/share/vlc32x32.png b/share/vlc32x32.png
index 0a717a1f502284c56823654c4887d9ed4d192dde..1a0f859991af7da7320eb2f8de446446fddad1a8 100644 (file)
Binary files a/share/vlc32x32.png and b/share/vlc32x32.png differ

diff --git a/share/vlc48x48.ico b/share/vlc48x48.ico
index 8c62276a38267da900a9687474431ea9d128a9ee..81c7197e956dd8b7d1abf633a926adb10da4eeb2 100644 (file)
Binary files a/share/vlc48x48.ico and b/share/vlc48x48.ico differ

diff --git a/share/vlc48x48.png b/share/vlc48x48.png
index be7a44ab3909082e8ab7a2e2ccf3fd45be477ea9..41b82ddfd9e67ca9e47bb99fdd322092154a4c2f 100644 (file)
Binary files a/share/vlc48x48.png and b/share/vlc48x48.png differ

diff --git a/share/vlc48x48new.ico b/share/vlc48x48new.ico
deleted file mode 100644 (file)
index b764a8b..0000000
Binary files a/share/vlc48x48new.ico and /dev/null differ

diff --git a/share/vlc_win32_rc.rc b/share/vlc_win32_rc.rc
index a5cae28f980142719da2c13f6373c325f41ceb85..0c35d47b11b1f6032f865f02c9c60be1a03575e1 100644 (file)
--- a/share/vlc_win32_rc.rc
+++ b/share/vlc_win32_rc.rc
@@ -1,4 +1,4 @@
-VLC_ICON ICON "vlc48x48new.ico"
+VLC_ICON ICON "vlc48x48.ico"
 #ifndef VERSION_NUMBER
 #define VERSION_NUMBER 0,0,0,0
 #endif