From 0874ae23a16946781dd517cfdb011c691ad0b581 Mon Sep 17 00:00:00 2001
From: marha <marha@users.sourceforge.net>
Date: Wed, 5 May 2010 09:43:03 +0000
Subject: svn merge -r571:HEAD "^/branches/released" .

---
 xorg-server/xkbdata.src/rules/HDR | 61 +++++++++++++++++++++------------------
 1 file changed, 33 insertions(+), 28 deletions(-)

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

diff --git a/xorg-server/xkbdata.src/rules/HDR b/xorg-server/xkbdata.src/rules/HDR
index cef1b52ad..769b8fc7f 100644
--- a/xorg-server/xkbdata.src/rules/HDR
+++ b/xorg-server/xkbdata.src/rules/HDR
@@ -1,28 +1,33 @@
-! model		=	keycodes
-! layout[1]	=	keycodes
-! layout	=	keycodes
-! option	=	keycodes
-! model		layout	=	geometry
-! model		=	geometry
-! model		layout		variant		=	symbols
-! model		layout				=	symbols
-! model		layout[1]			=	symbols
-! model		layout[1]	variant[1]	=	symbols
-! model		layout[2]	=	symbols
-! model		layout[3]	=	symbols
-! model		layout[4]	=	symbols
-! model		layout[2]	variant[2]	=	symbols
-! model		layout[3]	variant[3]	=	symbols
-! model		layout[4]	variant[4]	=	symbols
-! model		=	symbols
-! model		layout		=	compat
-! model		layout[1]	=	compat
-! model		=	types
-! layout	option	=	symbols
-! layout[1]	option	=	symbols
-! layout[2]	option	=	symbols
-! layout[3]	option	=	symbols
-! layout[4]	option	=	symbols
-! option	=	symbols
-! option	=	compat
-! option	=	types
+! model		=	keycodes
+! layout[1]	=	keycodes
+! layout	=	keycodes
+! option	=	keycodes
+! model		layout	=	geometry
+! model		=	geometry
+! model		layout		variant		=	symbols
+! model		layout				=	symbols
+! model		layout[1]			=	symbols
+! model		layout[1]	variant[1]	=	symbols
+! model		layout[2]	=	symbols
+! model		layout[3]	=	symbols
+! model		layout[4]	=	symbols
+! model		layout[2]	variant[2]	=	symbols
+! model		layout[3]	variant[3]	=	symbols
+! model		layout[4]	variant[4]	=	symbols
+! model		=	symbols
+! layout	variant		=	compat
+! layout[1]	variant[1]	=	compat
+! layout[2]	variant[2]	=	compat
+! layout[3]	variant[3]	=	compat
+! layout[4]	variant[4]	=	compat
+! model		layout		=	compat
+! model		layout[1]	=	compat
+! model		=	types
+! layout	option	=	symbols
+! layout[1]	option	=	symbols
+! layout[2]	option	=	symbols
+! layout[3]	option	=	symbols
+! layout[4]	option	=	symbols
+! option	=	symbols
+! option	=	compat
+! option	=	types
-- 
cgit v1.2.3