From f37fe8ec030759069bd7c00cecf2fd55c8e6f9ff Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Tue, 30 Mar 2010 14:39:51 +0000
Subject: svn merge -r516:HEAD ^/branches/released .

---
 xorg-server/xkbdata.src/symbols/Makefile.am | 78 ++++++++++++++---------------
 xorg-server/xkbdata.src/symbols/makefile    |  2 +-
 2 files changed, 40 insertions(+), 40 deletions(-)

(limited to 'xorg-server/xkbdata.src/symbols')

diff --git a/xorg-server/xkbdata.src/symbols/Makefile.am b/xorg-server/xkbdata.src/symbols/Makefile.am
index dea5a4ad8..61562eeb9 100644
--- a/xorg-server/xkbdata.src/symbols/Makefile.am
+++ b/xorg-server/xkbdata.src/symbols/Makefile.am
@@ -1,39 +1,39 @@
-SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
-
-symbolsdir = $(xkb_base)/symbols
-dist_symbols_DATA = \
-ad af al \
-am ara az \
-be bd \
-bg br ba \
-bt by brai \
-ca cd \
-ch cn cz \
-de dk \
-ee es et epo \
-fi fo fr \
-gb ge gh gn \
-gr hr hu \
-ie il in iq \
-ir is it jp \
-kg kh kr kz \
-la latam latin \
-lk lt lv \
-ma mao me \
-mk ml mm \
-mn mt mv \
-ng nl no np \
-pc pk pl pt \
-ro rs ru \
-se si sk sn \
-sy th \
-terminate \
-tj tm tr \
-ua us uz vn \
-za \
-altwin capslock compose ctrl empty eurosign group inet \
-keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
-
-dir_data = $(dist_symbols_DATA)
-
-include $(top_srcdir)/xkbrules.am
+SUBDIRS = digital_vndr fujitsu_vndr hp_vndr macintosh_vndr nec_vndr nokia_vndr sgi_vndr sony_vndr sun_vndr xfree68_vndr extras
+
+symbolsdir = $(xkb_base)/symbols
+dist_symbols_DATA = \
+ad af al \
+am ara az \
+be bd \
+bg br ba \
+bt by brai \
+ca cd \
+ch cn cz \
+de dk \
+ee es et epo \
+fi fo fr \
+gb ge gh gn \
+gr hr hu \
+ie il in iq \
+ir is it jp \
+kg kh kr kz \
+la latam latin \
+lk lt lv \
+ma mao me \
+mk ml mm \
+mn mt mv \
+ng nl no np \
+pc pk pl pt \
+ro rs ru \
+se si sk sn \
+sy th \
+terminate \
+tj tm tr tz \
+ua us uz vn \
+za \
+altwin capslock compose ctrl empty eurosign group inet \
+keypad kpdl level3 level5 nbsp olpc shift srvr_ctrl typo
+
+dir_data = $(dist_symbols_DATA)
+
+include $(top_srcdir)/xkbrules.am
diff --git a/xorg-server/xkbdata.src/symbols/makefile b/xorg-server/xkbdata.src/symbols/makefile
index 7e5293209..2a76ca789 100644
--- a/xorg-server/xkbdata.src/symbols/makefile
+++ b/xorg-server/xkbdata.src/symbols/makefile
@@ -35,7 +35,7 @@ ro rs ru \
 se si sk sn \
 sy th \
 terminate \
-tj tm tr \
+tj tm tr tz \
 ua us uz vn \
 za \
 altwin capslock compose ctrl empty eurosign group inet \
-- 
cgit v1.2.3