diff options
| author | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-07-16 07:53:32 +0200 |
| commit | 01102cdf33d68a7be192a139752831ff93dee117 (patch) | |
| tree | 84cc702a6d5bb77647f6df3840b41eb9a7b9faf4 /libX11 | |
| parent | dcf9ae77854778629cabd0d6943dda3678eb91fa (diff) | |
| parent | d09d7be8bbbb39926f44834023d7120535155829 (diff) | |
| download | vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.gz vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.tar.bz2 vcxsrv-01102cdf33d68a7be192a139752831ff93dee117.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
mesalib/src/glsl/.gitignore
mesalib/src/glsl/glcpp/.gitignore
Diffstat (limited to 'libX11')
| -rw-r--r-- | libX11/nls/en_US.UTF-8/Compose.pre | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libX11/nls/en_US.UTF-8/Compose.pre b/libX11/nls/en_US.UTF-8/Compose.pre index bf6599af0..de24dadec 100644 --- a/libX11/nls/en_US.UTF-8/Compose.pre +++ b/libX11/nls/en_US.UTF-8/Compose.pre @@ -5849,6 +5849,8 @@ XCOMM Characters from "Mathematical Operators" <Multi_key> <greater> <less> : "⋄" U22c4 # > < DIAMOND OPERATOR <Multi_key> <U2227> <U2228> : "⋄" U22c4 # ∧ ∨ DIAMOND OPERATOR <Multi_key> <U2228> <U2227> : "⋄" U22c4 # ∨ ∧ DIAMOND OPERATOR +<Multi_key> <colon> <period> : "∴" therefore # THEREFORE +<Multi_key> <period> <colon> : "∵" because # BECAUSE XCOMM Characters from "Miscellaneous Technical" |