[vlc-commits] macosx: resolve conflict between sidebar icons and other UI artwork ( refs #5742)

[Felix Paul Kühne]

vlc/vlc-1.2 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Dec 29 20:33:34 2011 +0100| [46fce878003144c18902b973a0b2345af61510dc] | committer: Jean-Baptiste Kempf

macosx: resolve conflict between sidebar icons and other UI artwork (refs #5742)
(cherry picked from commit 168b48cb412804b5a877fcbb7dbeeac60b01dc86)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commit;h=46fce878003144c18902b973a0b2345af61510dc
---

 Makefile.am                                        |   12 +++---
 .../sidebar-icons/{local.png => sidebar-local.png} |  Bin 1414 -> 1414 bytes
 .../sidebar-icons/{movie.png => sidebar-movie.png} |  Bin 1373 -> 1373 bytes
 .../sidebar-icons/{music.png => sidebar-music.png} |  Bin 1464 -> 1464 bytes
 .../{pictures.png => sidebar-pictures.png}         |  Bin 1409 -> 1409 bytes
 .../{playlist.png => sidebar-playlist.png}         |  Bin 1497 -> 1497 bytes
 .../{podcast.png => sidebar-podcast.png}           |  Bin 1503 -> 1503 bytes
 .../package/macosx/vlc.xcodeproj/project.pbxproj   |   48 ++++++++++----------
 modules/gui/macosx/MainWindow.m                    |   12 +++---
 9 files changed, 36 insertions(+), 36 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc/vlc-1.2.git/?a=commitdiff;h=46fce878003144c18902b973a0b2345af61510dc