diff options
author | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
---|---|---|
committer | marha <marha@users.sourceforge.net> | 2011-02-20 14:23:37 +0000 |
commit | 684eb992146cad24b690073f33b909f47150b841 (patch) | |
tree | 7bc62d6f06c5e8a8114b56fa78485cb7ec08f26b /xorg-server/xkeyboard-config/semantics | |
parent | 53810445215dc45ae303bc89feb6e0aaf04aa6fa (diff) | |
parent | 8a191c08ddda2e66fa26f148d6c21959bb08f923 (diff) | |
download | vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.gz vcxsrv-684eb992146cad24b690073f33b909f47150b841.tar.bz2 vcxsrv-684eb992146cad24b690073f33b909f47150b841.zip |
svn merge ^/branches/released .
Diffstat (limited to 'xorg-server/xkeyboard-config/semantics')
-rw-r--r-- | xorg-server/xkeyboard-config/semantics/basic | 13 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/semantics/complete | 13 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/semantics/default.in | 1 | ||||
-rw-r--r-- | xorg-server/xkeyboard-config/semantics/xtest | 13 |
4 files changed, 18 insertions, 22 deletions
diff --git a/xorg-server/xkeyboard-config/semantics/basic b/xorg-server/xkeyboard-config/semantics/basic index 014e9ca68..71575a3a3 100644 --- a/xorg-server/xkeyboard-config/semantics/basic +++ b/xorg-server/xkeyboard-config/semantics/basic @@ -1,7 +1,6 @@ -// $Xorg: basic,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ -default xkb_semantics "basic" { - -xkb_types { include "basic" }; -xkb_compatibility { include "basic" }; - -}; +default xkb_semantics "basic" {
+
+xkb_types { include "basic" };
+xkb_compatibility { include "basic" };
+
+};
diff --git a/xorg-server/xkeyboard-config/semantics/complete b/xorg-server/xkeyboard-config/semantics/complete index df1632e29..08152e563 100644 --- a/xorg-server/xkeyboard-config/semantics/complete +++ b/xorg-server/xkeyboard-config/semantics/complete @@ -1,7 +1,6 @@ -// $Xorg: complete,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ -default xkb_semantics "complete" { - -xkb_types { include "complete" }; -xkb_compatibility { include "complete" }; - -}; +default xkb_semantics "complete" {
+
+xkb_types { include "complete" };
+xkb_compatibility { include "complete" };
+
+};
diff --git a/xorg-server/xkeyboard-config/semantics/default.in b/xorg-server/xkeyboard-config/semantics/default.in index 42e755e3c..a6e70c991 100644 --- a/xorg-server/xkeyboard-config/semantics/default.in +++ b/xorg-server/xkeyboard-config/semantics/default.in @@ -1,4 +1,3 @@ -// $Xorg: default,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ default xkb_semantics "default" { xkb_types { include "default" }; diff --git a/xorg-server/xkeyboard-config/semantics/xtest b/xorg-server/xkeyboard-config/semantics/xtest index d221fe5b4..64a35459b 100644 --- a/xorg-server/xkeyboard-config/semantics/xtest +++ b/xorg-server/xkeyboard-config/semantics/xtest @@ -1,7 +1,6 @@ -// $Xorg: xtest,v 1.3 2000/08/17 19:54:42 cpqbld Exp $ -default xkb_semantics "xtest" { - -xkb_types { include "basic" }; -xkb_compatibility { include "xtest" }; - -}; +default xkb_semantics "xtest" {
+
+xkb_types { include "basic" };
+xkb_compatibility { include "xtest" };
+
+};
|