xserver: Branch 'master' - 2 commits

[Jeremy Huddleston]

 hw/xquartz/bundle/Makefile.am |   56 +++++++++++++++++++++++++++++++++++++++---
 1 file changed, 53 insertions(+), 3 deletions(-)

New commits:
commit d103820bb8635c63b34b85b45cad95ed9c152d90
Author: Jeremy Huddleston <jeremy at tifa-2.local>
Date:   Sat Feb 16 00:35:50 2008 -0800

    Fixed unescaped newline in EXTRA_DIST
    (cherry picked from commit 567c172c4d400fdfe69e7b096a3877fce5c2de9f)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 95cfd19..093a102 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -18,7 +18,7 @@ EXTRA_DIST = \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \
-	X11.xcodeproj/project.pbxproj
+	X11.xcodeproj/project.pbxproj \
 	Dutch.lproj/InfoPlist.strings \
 	Dutch.lproj/Localizable.strings \
 	Dutch.lproj/main.nib/keyedobjects.nib \
commit a7d936c4ac8e3d7227ecbfe0ddc6cc257b450458
Author: Jeremy Huddleston <jeremy at tifa.local>
Date:   Mon Feb 11 16:09:03 2008 -0800

    XQuartz: Fixed EXTRA_DIST to include localization
    (cherry picked from commit 1b338c2a9330c85490a7c24d52adf24b124b70e6)

diff --git a/hw/xquartz/bundle/Makefile.am b/hw/xquartz/bundle/Makefile.am
index 00d540f..95cfd19 100644
--- a/hw/xquartz/bundle/Makefile.am
+++ b/hw/xquartz/bundle/Makefile.am
@@ -18,9 +18,59 @@ EXTRA_DIST = \
 	Info.plist \
 	X11.icns \
 	bundle-main.c \
+	X11.xcodeproj/project.pbxproj
+	Dutch.lproj/InfoPlist.strings \
+	Dutch.lproj/Localizable.strings \
+	Dutch.lproj/main.nib/keyedobjects.nib \
 	English.lproj/InfoPlist.strings \
 	English.lproj/Localizable.strings \
-	English.lproj/main.nib/classes.nib \
-	English.lproj/main.nib/info.nib \
+	English.lproj/main.nib/designable.nib \
 	English.lproj/main.nib/keyedobjects.nib \
-	X11.xcodeproj/project.pbxproj
+	French.lproj/InfoPlist.strings \
+	French.lproj/Localizable.strings \
+	French.lproj/main.nib/keyedobjects.nib \
+	German.lproj/InfoPlist.strings \
+	German.lproj/Localizable.strings \
+	German.lproj/main.nib/keyedobjects.nib \
+	Italian.lproj/InfoPlist.strings \
+	Italian.lproj/Localizable.strings \
+	Italian.lproj/main.nib/keyedobjects.nib \
+	Japanese.lproj/InfoPlist.strings \
+	Japanese.lproj/Localizable.strings \
+	Japanese.lproj/main.nib/keyedobjects.nib \
+	Spanish.lproj/InfoPlist.strings \
+	Spanish.lproj/Localizable.strings \
+	Spanish.lproj/main.nib/keyedobjects.nib \
+	da.lproj/InfoPlist.strings \
+	da.lproj/Localizable.strings \
+	da.lproj/main.nib/keyedobjects.nib \
+	fi.lproj/InfoPlist.strings \
+	fi.lproj/Localizable.strings \
+	fi.lproj/main.nib/keyedobjects.nib \
+	ko.lproj/InfoPlist.strings \
+	ko.lproj/Localizable.strings \
+	ko.lproj/main.nib/keyedobjects.nib \
+	no.lproj/InfoPlist.strings \
+	no.lproj/Localizable.strings \
+	no.lproj/main.nib/keyedobjects.nib \
+	pl.lproj/InfoPlist.strings \
+	pl.lproj/Localizable.strings \
+	pl.lproj/main.nib/keyedobjects.nib \
+	pt.lproj/InfoPlist.strings \
+	pt.lproj/Localizable.strings \
+	pt.lproj/main.nib/keyedobjects.nib \
+	pt_PT.lproj/InfoPlist.strings \
+	pt_PT.lproj/Localizable.strings \
+	pt_PT.lproj/main.nib/keyedobjects.nib \
+	ru.lproj/InfoPlist.strings \
+	ru.lproj/Localizable.strings \
+	ru.lproj/main.nib/keyedobjects.nib \
+	sv.lproj/InfoPlist.strings \
+	sv.lproj/Localizable.strings \
+	sv.lproj/main.nib/keyedobjects.nib \
+	zh_CN.lproj/InfoPlist.strings \
+	zh_CN.lproj/Localizable.strings \
+	zh_CN.lproj/main.nib/keyedobjects.nib \
+	zh_TW.lproj/InfoPlist.strings \
+	zh_TW.lproj/Localizable.strings \
+	zh_TW.lproj/main.nib/keyedobjects.nib