diff options
| author | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-12-10 08:55:36 +0100 |
| commit | a0124a5e8e70979d2c24ef55285da989fdad766a (patch) | |
| tree | 5cea5c9804a8edf67bc7260e0851a20d21324547 /libX11/nls/zh_CN.UTF-8/Compose.pre | |
| parent | 514b4afb64ccbf8e954270105ed5064272a2be68 (diff) | |
| parent | 0328076efb5ff6e62152c09e38d0d11f7931d07b (diff) | |
| download | vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.gz vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.tar.bz2 vcxsrv-a0124a5e8e70979d2c24ef55285da989fdad766a.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 mesa pixman git update 10 dec 2012
Conflicts:
fontconfig/src/fcxml.c
Diffstat (limited to 'libX11/nls/zh_CN.UTF-8/Compose.pre')
| -rw-r--r-- | libX11/nls/zh_CN.UTF-8/Compose.pre | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/libX11/nls/zh_CN.UTF-8/Compose.pre b/libX11/nls/zh_CN.UTF-8/Compose.pre index e69de29bb..6c2c4114d 100644 --- a/libX11/nls/zh_CN.UTF-8/Compose.pre +++ b/libX11/nls/zh_CN.UTF-8/Compose.pre @@ -0,0 +1 @@ +include "X11_LOCALEDATADIR/en_US.UTF-8/Compose" |