aboutsummaryrefslogtreecommitdiff
path: root/libX11
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2011-10-05 17:44:57 +0200
committermarha <marha@users.sourceforge.net>2011-10-05 17:44:57 +0200
commit8af87a5b60e37ae84fdd759e2c1602be38be4905 (patch)
tree2e621c7fbdc4dfe9eb8d733af4cc232bc03643d4 /libX11
parent8238de0fe0c28bd54b3e6cdd1fc94513cf21d3cc (diff)
parentf7025b4baa1ba35ee796785641f04eac5bedb0a6 (diff)
downloadvcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.gz
vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.tar.bz2
vcxsrv-8af87a5b60e37ae84fdd759e2c1602be38be4905.zip
Merge remote-tracking branch 'origin/released'
Conflicts: mesalib/src/mapi/glapi/glapi.h mesalib/src/mesa/main/syncobj.h xorg-server/dix/events.c xorg-server/dix/getevents.c xorg-server/include/misc.h
Diffstat (limited to 'libX11')
-rw-r--r--libX11/nls/iso8859-1/Compose.pre2
1 files changed, 1 insertions, 1 deletions
diff --git a/libX11/nls/iso8859-1/Compose.pre b/libX11/nls/iso8859-1/Compose.pre
index 39f596777..c726ecf73 100644
--- a/libX11/nls/iso8859-1/Compose.pre
+++ b/libX11/nls/iso8859-1/Compose.pre
@@ -477,7 +477,7 @@ XCOMM Special Character
Ctrl<T> <plus> <plus> : "#" numbersign
Ctrl<T> <apostrophe> <space> : "'" apostrophe
Ctrl<T> <space> <apostrophe> : "'" apostrophe
-Ctrl<T> <A> <A> : "@" at
+Ctrl<T> <A> <T> : "@" at
Ctrl<T> <parenleft> <parenleft> : "[" bracketleft
Ctrl<T> <slash> <slash> : "\\" backslash
Ctrl<T> <slash> <less> : "\\" backslash