]> git.sesse.net Git - vlc/commit
macosx: resolve conflict between sidebar icons and other UI artwork (refs #5742)
authorFelix Paul Kühne <fkuehne@videolan.org>
Thu, 29 Dec 2011 19:33:34 +0000 (20:33 +0100)
committerFelix Paul Kühne <fkuehne@videolan.org>
Thu, 29 Dec 2011 20:57:55 +0000 (21:57 +0100)
commit168b48cb412804b5a877fcbb7dbeeac60b01dc86
tree69ddcf549809403bd3bb8205edc7ea3e6143b272
parent65d1a6dc54734b700fbea4e8bc7c8763a025181b
macosx: resolve conflict between sidebar icons and other UI artwork (refs #5742)
Makefile.am
extras/package/macosx/Resources/sidebar-icons/sidebar-local.png [moved from extras/package/macosx/Resources/sidebar-icons/local.png with 100% similarity]
extras/package/macosx/Resources/sidebar-icons/sidebar-movie.png [moved from extras/package/macosx/Resources/sidebar-icons/movie.png with 100% similarity]
extras/package/macosx/Resources/sidebar-icons/sidebar-music.png [moved from extras/package/macosx/Resources/sidebar-icons/music.png with 100% similarity]
extras/package/macosx/Resources/sidebar-icons/sidebar-pictures.png [moved from extras/package/macosx/Resources/sidebar-icons/pictures.png with 100% similarity]
extras/package/macosx/Resources/sidebar-icons/sidebar-playlist.png [moved from extras/package/macosx/Resources/sidebar-icons/playlist.png with 100% similarity]
extras/package/macosx/Resources/sidebar-icons/sidebar-podcast.png [moved from extras/package/macosx/Resources/sidebar-icons/podcast.png with 100% similarity]
extras/package/macosx/vlc.xcodeproj/project.pbxproj
modules/gui/macosx/MainWindow.m