[vlc-commits] macosx: Cocoa cannot deal with 2 images of the same name in a single bundle even if their type is different

[Felix Paul Kühne]

vlc | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Tue Jun 12 20:29:34 2012 +0200| [6051f82ac2a50ce9210ab8ffe052b2784952d18a] | committer: Felix Paul Kühne

macosx: Cocoa cannot deal with 2 images of the same name in a single bundle even if their type is different

Hence, rename one of them.

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=6051f82ac2a50ce9210ab8ffe052b2784952d18a
---

 Makefile.am                                        |    6 +--
 .../macosx/Resources/English.lproj/MainMenu.xib    |   42 ++++++++++----------
 .../{playlist-blue.png => playlist-btn-blue.png}   |  Bin 598 -> 598 bytes
 ...aylist-pressed.png => playlist-btn-pressed.png} |  Bin 370 -> 370 bytes
 .../mainwindow/{playlist.png => playlist-btn.png}  |  Bin 315 -> 315 bytes
 .../package/macosx/vlc.xcodeproj/project.pbxproj   |   24 +++++------
 modules/gui/macosx/MainWindow.m                    |    4 +-
 7 files changed, 38 insertions(+), 38 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc.git/?a=commitdiff;h=6051f82ac2a50ce9210ab8ffe052b2784952d18a