diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-27 08:37:02 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-27 08:37:02 +0200 |
| commit | 2233c44285f7e820f04abd07d6cf5eedbe32b8a3 (patch) | |
| tree | 80d64c8daf68c57aaf3b6937cbd075161deaa3d2 /libX11/nls/en_US.UTF-8/Compose.pre | |
| parent | 95acf9816e008fa46a6c2fa2f35500deb358bb69 (diff) | |
| parent | 183b7373f9919eeb5eb408f38578e01717b2cc10 (diff) | |
| download | vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.tar.gz vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.tar.bz2 vcxsrv-2233c44285f7e820f04abd07d6cf5eedbe32b8a3.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/mesa/main/version.c
xorg-server/include/globals.h
xorg-server/mi/misprite.c
xorg-server/mi/mivaltree.c
xorg-server/os/utils.c
Diffstat (limited to 'libX11/nls/en_US.UTF-8/Compose.pre')
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index db7a1d37b..907720eab 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -179,9 +179,7 @@ XCOMM "₵" U20b5 CEDI SIGN <Multi_key> <bar> <c> : "¢" cent # CENT SIGN <Multi_key> <C> <bar> : "¢" cent # CENT SIGN <Multi_key> <c> <bar> : "¢" cent # CENT SIGN -<Multi_key> <C> <slash> : "¢" cent # CENT SIGN <Multi_key> <c> <slash> : "¢" cent # CENT SIGN -<Multi_key> <slash> <C> : "¢" cent # CENT SIGN <Multi_key> <slash> <c> : "¢" cent # CENT SIGN <Multi_key> <L> <minus> : "£" sterling # POUND SIGN <Multi_key> <l> <minus> : "£" sterling # POUND SIGN |