svn merge ^/branches/released .

32 files changed, 0 insertions, 36 deletions

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
index ea54207b8..d62bb6da9 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ara
@@ -114,4 +114,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/ara(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/be b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
index d6ce057d4..58abfd6e6 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/be
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/be
@@ -96,4 +96,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/be(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/br b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
index 4d966f551..3cea0bf9c 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/br
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/br
@@ -99,4 +99,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/br(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
index 0f0aa2923..6fb72c462 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ca
@@ -95,4 +95,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/ca(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
index c952fc559..82c0681cc 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ch
@@ -131,4 +131,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/ch(de_type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
index 6f6b198c5..55859db9a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/cz
@@ -103,4 +103,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/cz(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/de b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
index 3b1301687..2c46ea941 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/de
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/de
@@ -138,4 +138,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/de(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
index 4f43112ab..0cc81153d 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/dk
@@ -145,4 +145,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/dk(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
index 1070719a5..914a80dde 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ee
@@ -115,4 +115,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/ee(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/es b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
index 789df5519..9cb25f382 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/es
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/es
@@ -143,4 +143,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/es(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
index 817423968..a2f8cd8f4 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fi
@@ -87,4 +87,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/fi(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
index f52d1956b..e3e6828ef 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/fr
@@ -94,4 +94,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/fr(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
index d21a116cf..fc775cd98 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gb
@@ -100,4 +100,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/gb(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
index aa5fecbfa..c3a83dad0 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/gr
@@ -115,4 +115,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/gr(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/it b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
index 960bcfc32..7149b0996 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/it
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/it
@@ -138,4 +138,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/it(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
index 5be8647d2..9b6579e2a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/jp
@@ -1,4 +1,3 @@
-// $XdotOrg: $

 //

 // Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

 //

@@ -27,7 +26,6 @@
 // or other dealings in this Software without prior written authorization

 // of the copyright holder.

 //

-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $

 //

 //Copyright 1996, 1998  The Open Group

 //

@@ -816,4 +814,3 @@ xkb_symbols "type7" {
     key <HENK> { [ Kana_Lock, Mode_switch ] };

     key <ALGR> { [ Alt_R, Alt_R ] };

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
index 51959b23f..0973943bf 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/kr
@@ -95,4 +95,3 @@ partial default alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/kr(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
index 6e51cb342..b82ebcfb9 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lt
@@ -116,4 +116,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/lt(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
index 6661afddf..d1573868b 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/lv
@@ -115,4 +115,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/lv(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
index 703614277..8469039f7 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/nl
@@ -146,4 +146,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/nl(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/no b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
index 1d1d43449..bbb414da7 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/no
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/no
@@ -142,4 +142,3 @@ partial default alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/no(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
index 684b54911..6295c3206 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pl
@@ -99,4 +99,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/pl(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
index 561abb594..b5b108632 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/pt
@@ -140,4 +140,3 @@ partial default alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/pt(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
index df87262ed..f21f9f624 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ro
@@ -115,4 +115,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/ro(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
index 833576dcc..ec19c9ba3 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ru
@@ -109,4 +109,3 @@ partial default alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/ru(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/se b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
index ec41629cb..4efaf85fa 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/se
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/se
@@ -277,4 +277,3 @@ partial default alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/se(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
index f27726013..ee49a7008 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/sk
@@ -107,4 +107,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/sk(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
index 3c95110a1..4eb8d6511 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tr
@@ -90,4 +90,3 @@ partial default alphanumeric_keys
         xkb_symbols "basic" {

         include "sun_vndr/tr(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
index 0eda715d8..64037ac42 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tuv
@@ -1,4 +1,3 @@
-// $XdotOrg: $

 //

 // Copyright 2010 Sun Microsystems, Inc.  All rights reserved.

 //

@@ -27,7 +26,6 @@
 // or other dealings in this Software without prior written authorization

 // of the copyright holder.

 //

-// $TOG: us /main/5 1998/02/10 13:45:06 kaleb $

 //

 //Copyright 1996, 1998  The Open Group

 //

@@ -261,4 +259,3 @@ xkb_symbols "type5" {
     key <AD03> { [ e, E			], [ EuroSign	]	};

     key <BKSL> { [ backslash, bar	], [ brokenbar	]	};

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
index a4c011d45..3f6569d2a 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/tw
@@ -76,4 +76,3 @@ xkb_symbols "type5" {
     key <BKSL> { [ backslash, bar,  brokenbar	]		};

 

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
index c49b21bce..b18fad4d7 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/ua
@@ -115,4 +115,3 @@ partial alphanumeric_keys
 	xkb_symbols "basic" {

 	include "sun_vndr/ua(type6)"

 };

-

diff --git a/xorg-server/xkeyboard-config/symbols/sun_vndr/us b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
index 8a857a5ab..48d15df17 100644
--- a/xorg-server/xkeyboard-config/symbols/sun_vndr/us
+++ b/xorg-server/xkeyboard-config/symbols/sun_vndr/us
@@ -398,4 +398,3 @@ xkb_symbols "US101A_Sun" {
     key <RALT> { [ Alt_L		]				};

     key <RCTL> { [ Multi_key		]				};

 };

-