For now trunk only: use the new icon everywhere, and mark the images as binary files
authorDerk-Jan Hartman <hartman@videolan.org>
Wed, 23 Nov 2005 13:43:55 +0000 (13:43 +0000)
committerDerk-Jan Hartman <hartman@videolan.org>
Wed, 23 Nov 2005 13:43:55 +0000 (13:43 +0000)
share/Makefile.am
share/http/favicon.ico
share/vlc-icons.xcf [deleted file]
share/vlc.icns
share/vlc128x128.png [new file with mode: 0644]
share/vlc16x16.png
share/vlc32x32.png
share/vlc48x48.ico
share/vlc48x48.png
share/vlc48x48new.ico [deleted file]
share/vlc_win32_rc.rc

index 00f5fb3..1412553 100644 (file)
@@ -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 = \
index dfacdf5..81c7197 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
index b624528..0bf78c5 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
index b41a697..ce7633e 100644 (file)
Binary files a/share/vlc16x16.png and b/share/vlc16x16.png differ
index 0a717a1..1a0f859 100644 (file)
Binary files a/share/vlc32x32.png and b/share/vlc32x32.png differ
index 8c62276..81c7197 100644 (file)
Binary files a/share/vlc48x48.ico and b/share/vlc48x48.ico differ
index be7a44a..41b82dd 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
index a5cae28..0c35d47 100644 (file)
@@ -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