[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/vlc-2.0 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Thu Jun 14 14:41:21 2012 +0200| [07ef9fa5e1beb7a0fa879905b9eb9496ec13bbf6] | 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.

This is a manual backport of 6051f82ac2a50ce9210ab8ffe052b2784952d18a.

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commit;h=07ef9fa5e1beb7a0fa879905b9eb9496ec13bbf6
---

 Makefile.am                                        |    6 ++---
 .../macosx/Resources/English.lproj/MainMenu.xib    |   24 ++++++++++----------
 .../{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, 29 insertions(+), 29 deletions(-)

Diff:   http://git.videolan.org/gitweb.cgi/vlc/vlc-2.0.git/?a=commitdiff;h=07ef9fa5e1beb7a0fa879905b9eb9496ec13bbf6