]> git.sesse.net Git - vlc/commit
macosx: Cocoa cannot deal with 2 images of the same name in a single bundle even...
authorFelix Paul Kühne <fkuehne@videolan.org>
Tue, 12 Jun 2012 18:29:34 +0000 (20:29 +0200)
committerFelix Paul Kühne <fkuehne@videolan.org>
Tue, 12 Jun 2012 18:33:46 +0000 (20:33 +0200)
commit6051f82ac2a50ce9210ab8ffe052b2784952d18a
treedd9e97c8e524eb49b14220c0afec0af33e5cdb17
parentf23389df0f358ec05ed0483a91cd4cfc56f867a5
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.
Makefile.am
extras/package/macosx/Resources/English.lproj/MainMenu.xib
extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png [moved from extras/package/macosx/Resources/mainwindow/playlist-blue.png with 100% similarity]
extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png [moved from extras/package/macosx/Resources/mainwindow/playlist-pressed.png with 100% similarity]
extras/package/macosx/Resources/mainwindow/playlist-btn.png [moved from extras/package/macosx/Resources/mainwindow/playlist.png with 100% similarity]
extras/package/macosx/vlc.xcodeproj/project.pbxproj
modules/gui/macosx/MainWindow.m