diff options
| author | marha <marha@users.sourceforge.net> | 2011-08-04 16:54:51 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-08-04 16:54:51 +0200 |
| commit | 23cc74efd16feb2676978b9919a8510ed7804ed9 (patch) | |
| tree | 15324c9a805744a54489f24c95f5eb94a0cc7adf /xorg-server/hw/xquartz/bundle/Makefile.am | |
| parent | 30aa3aea81afd082cba94028183ac9d5c7c1e123 (diff) | |
| parent | 9b009a8bdb31d08e3d07f68416373b9aa6f85724 (diff) | |
| download | vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.gz vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.tar.bz2 vcxsrv-23cc74efd16feb2676978b9919a8510ed7804ed9.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/link_functions.cpp
mesalib/src/glsl/linker.cpp
mesalib/src/glsl/main.cpp
mesalib/src/mesa/program/ir_to_mesa.cpp
xorg-server/composite/compalloc.c
xorg-server/configure.ac
xorg-server/hw/xquartz/X11Application.m
xorg-server/hw/xquartz/bundle/Makefile.am
xorg-server/hw/xquartz/xpr/xprFrame.c
xorg-server/include/windowstr.h
Diffstat (limited to 'xorg-server/hw/xquartz/bundle/Makefile.am')
| -rw-r--r-- | xorg-server/hw/xquartz/bundle/Makefile.am | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/xorg-server/hw/xquartz/bundle/Makefile.am b/xorg-server/hw/xquartz/bundle/Makefile.am index a455b147d..2f86cdc95 100644 --- a/xorg-server/hw/xquartz/bundle/Makefile.am +++ b/xorg-server/hw/xquartz/bundle/Makefile.am @@ -40,6 +40,9 @@ EXTRA_DIST = \ Resources/Dutch.lproj/InfoPlist.strings \
Resources/Dutch.lproj/Localizable.strings \
Resources/Dutch.lproj/main.nib/keyedobjects.nib \
+ Resources/el.lproj/InfoPlist.strings \
+ Resources/el.lproj/Localizable.strings \
+ Resources/el.lproj/main.nib/keyedobjects.nib \
Resources/English.lproj/InfoPlist.strings \
Resources/English.lproj/Localizable.strings \
Resources/English.lproj/main.nib/designable.nib \
@@ -53,6 +56,9 @@ EXTRA_DIST = \ Resources/German.lproj/InfoPlist.strings \
Resources/German.lproj/Localizable.strings \
Resources/German.lproj/main.nib/keyedobjects.nib \
+ Resources/he.lproj/InfoPlist.strings \
+ Resources/he.lproj/Localizable.strings \
+ Resources/he.lproj/main.nib/keyedobjects.nib \
Resources/Italian.lproj/InfoPlist.strings \
Resources/Italian.lproj/Localizable.strings \
Resources/Italian.lproj/main.nib/keyedobjects.nib \
@@ -77,6 +83,9 @@ EXTRA_DIST = \ Resources/ru.lproj/InfoPlist.strings \
Resources/ru.lproj/Localizable.strings \
Resources/ru.lproj/main.nib/keyedobjects.nib \
+ Resources/sk.lproj/InfoPlist.strings \
+ Resources/sk.lproj/Localizable.strings \
+ Resources/sk.lproj/main.nib/keyedobjects.nib \
Resources/Spanish.lproj/InfoPlist.strings \
Resources/Spanish.lproj/Localizable.strings \
Resources/Spanish.lproj/main.nib/keyedobjects.nib \
|