vlc/vlc-2.0 | branch: master | Felix Paul Kühne <[email protected]> | Wed 
Jun 27 20:06:45 2012 +0200| [e8c15f6081b78e543f5db13f2daaad554d3a2a54] | 
committer: Felix Paul Kühne

macosx: fixed names of 2 retina graphics

manual back-port of 44cdb9b3254ce051e05cb26cef6b78bf501f3427

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

 Makefile.am                                            |    4 ++--
 .../{[email protected] => [email protected]} |  Bin 2041 -> 2041 
bytes
 [email protected] => [email protected]} |  Bin 1327 -> 1327 
bytes
 extras/package/macosx/vlc.xcodeproj/project.pbxproj    |   16 ++++++++--------
 4 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index c9dc7ac..27e7cff 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -239,12 +239,12 @@ EXTRA_DIST += \
        extras/package/macosx/Resources/mainwindow/[email protected] \
        extras/package/macosx/Resources/mainwindow/play.png \
        extras/package/macosx/Resources/mainwindow/[email protected] \
-       extras/package/macosx/Resources/mainwindow/[email protected] \
        extras/package/macosx/Resources/mainwindow/playlist-btn-blue.png \
+       extras/package/macosx/Resources/mainwindow/[email protected] \
        extras/package/macosx/Resources/mainwindow/playlist-btn-pressed.png \
+       extras/package/macosx/Resources/mainwindow/[email protected] \
        extras/package/macosx/Resources/mainwindow/playlist-btn.png \
        extras/package/macosx/Resources/mainwindow/[email protected] \
-       extras/package/macosx/Resources/mainwindow/[email protected] \
        extras/package/macosx/Resources/mainwindow/progression-fill-left.png \
        extras/package/macosx/Resources/mainwindow/[email protected] 
\
        extras/package/macosx/Resources/mainwindow/progression-fill-middle.png \
diff --git a/extras/package/macosx/Resources/mainwindow/[email protected] 
b/extras/package/macosx/Resources/mainwindow/[email protected]
similarity index 100%
rename from extras/package/macosx/Resources/mainwindow/[email protected]
rename to extras/package/macosx/Resources/mainwindow/[email protected]
diff --git a/extras/package/macosx/Resources/mainwindow/[email protected] 
b/extras/package/macosx/Resources/mainwindow/[email protected]
similarity index 100%
rename from extras/package/macosx/Resources/mainwindow/[email protected]
rename to extras/package/macosx/Resources/mainwindow/[email protected]
diff --git a/extras/package/macosx/vlc.xcodeproj/project.pbxproj 
b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
index 2f580ac..5d81938 100644
--- a/extras/package/macosx/vlc.xcodeproj/project.pbxproj
+++ b/extras/package/macosx/vlc.xcodeproj/project.pbxproj
@@ -315,9 +315,9 @@
                CCBAA751159B5A7800D8348C /* [email protected] in Resources */ = {isa 
= PBXBuildFile; fileRef = CCBAA725159B5A7800D8348C /* [email protected] */; };
                CCBAA752159B5A7800D8348C /* [email protected] in Resources */ 
= {isa = PBXBuildFile; fileRef = CCBAA726159B5A7800D8348C /* 
[email protected] */; };
                CCBAA753159B5A7800D8348C /* [email protected] in Resources */ = {isa 
= PBXBuildFile; fileRef = CCBAA727159B5A7800D8348C /* [email protected] */; };
-               CCBAA754159B5A7800D8348C /* [email protected] in Resources 
*/ = {isa = PBXBuildFile; fileRef = CCBAA728159B5A7800D8348C /* 
[email protected] */; };
+               CCBAA754159B5A7800D8348C /* [email protected] in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA728159B5A7800D8348C /* 
[email protected] */; };
                CCBAA755159B5A7800D8348C /* [email protected] in Resources */ 
= {isa = PBXBuildFile; fileRef = CCBAA729159B5A7800D8348C /* 
[email protected] */; };
-               CCBAA756159B5A7800D8348C /* [email protected] in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA72A159B5A7800D8348C /* 
[email protected] */; };
+               CCBAA756159B5A7800D8348C /* [email protected] in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA72A159B5A7800D8348C /* 
[email protected] */; };
                CCBAA757159B5A7800D8348C /* [email protected] in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA72B159B5A7800D8348C /* 
[email protected] */; };
                CCBAA758159B5A7800D8348C /* [email protected] in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA72C159B5A7800D8348C /* 
[email protected] */; };
                CCBAA759159B5A7800D8348C /* [email protected] in 
Resources */ = {isa = PBXBuildFile; fileRef = CCBAA72D159B5A7800D8348C /* 
[email protected] */; };
@@ -789,9 +789,9 @@
                CCBAA725159B5A7800D8348C /* [email protected] */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
                CCBAA726159B5A7800D8348C /* [email protected] */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; 
path = "Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
                CCBAA727159B5A7800D8348C /* [email protected] */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
-               CCBAA728159B5A7800D8348C /* [email protected] */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; 
path = "Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
+               CCBAA728159B5A7800D8348C /* [email protected] */ = {isa 
= PBXFileReference; lastKnownFileType = image.png; name = 
"[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
                CCBAA729159B5A7800D8348C /* [email protected] */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = "[email protected]"; 
path = "Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
-               CCBAA72A159B5A7800D8348C /* [email protected] */ = {isa = 
PBXFileReference; lastKnownFileType = image.png; name = 
"[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
+               CCBAA72A159B5A7800D8348C /* [email protected] */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
                CCBAA72B159B5A7800D8348C /* [email protected] */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
                CCBAA72C159B5A7800D8348C /* [email protected] */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; 
};
                CCBAA72D159B5A7800D8348C /* [email protected] */ = 
{isa = PBXFileReference; lastKnownFileType = image.png; name = 
"[email protected]"; path = 
"Resources/mainwindow/[email protected]"; sourceTree = "<group>"; };
@@ -1225,9 +1225,9 @@
                                CCBAA725159B5A7800D8348C /* [email protected] */,
                                CCBAA726159B5A7800D8348C /* [email protected] 
*/,
                                CCBAA727159B5A7800D8348C /* [email protected] */,
-                               CCBAA728159B5A7800D8348C /* 
[email protected] */,
+                               CCBAA728159B5A7800D8348C /* 
[email protected] */,
                                CCBAA729159B5A7800D8348C /* [email protected] 
*/,
-                               CCBAA72A159B5A7800D8348C /* 
[email protected] */,
+                               CCBAA72A159B5A7800D8348C /* 
[email protected] */,
                                CCBAA72B159B5A7800D8348C /* 
[email protected] */,
                                CCBAA72C159B5A7800D8348C /* 
[email protected] */,
                                CCBAA72D159B5A7800D8348C /* 
[email protected] */,
@@ -1946,9 +1946,9 @@
                                CCBAA751159B5A7800D8348C /* [email protected] in 
Resources */,
                                CCBAA752159B5A7800D8348C /* [email protected] 
in Resources */,
                                CCBAA753159B5A7800D8348C /* [email protected] in 
Resources */,
-                               CCBAA754159B5A7800D8348C /* 
[email protected] in Resources */,
+                               CCBAA754159B5A7800D8348C /* 
[email protected] in Resources */,
                                CCBAA755159B5A7800D8348C /* [email protected] 
in Resources */,
-                               CCBAA756159B5A7800D8348C /* 
[email protected] in Resources */,
+                               CCBAA756159B5A7800D8348C /* 
[email protected] in Resources */,
                                CCBAA757159B5A7800D8348C /* 
[email protected] in Resources */,
                                CCBAA758159B5A7800D8348C /* 
[email protected] in Resources */,
                                CCBAA759159B5A7800D8348C /* 
[email protected] in Resources */,

_______________________________________________
vlc-commits mailing list
[email protected]
http://mailman.videolan.org/listinfo/vlc-commits

Reply via email to