diff options
| author | marha <marha@users.sourceforge.net> | 2013-07-09 11:32:22 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2013-07-09 11:32:22 +0200 |
| commit | f8f0209a691e0d0838d1ef9d602ebacafee2a233 (patch) | |
| tree | 591285bbfdecaf92be8bb3fd2291f9f17bc2c822 /libX11/nls | |
| parent | ecf91092594b6cd72548f6a675515e84516398ff (diff) | |
| parent | c6069c33e3a4a6d48aa059dbe9a78702dabff9cc (diff) | |
| download | vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.tar.gz vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.tar.bz2 vcxsrv-f8f0209a691e0d0838d1ef9d602ebacafee2a233.zip | |
Merge remote-tracking branch 'origin/released'
* origin/released:
fontconfig libX11 libxcb mesa git update 9 Jul 2013
Diffstat (limited to 'libX11/nls')
| -rw-r--r-- | libX11/nls/C/XI18N_OBJS | 2 | ||||
| -rw-r--r-- | libX11/nls/en_US.UTF-8/XI18N_OBJS | 5 | ||||
| -rw-r--r-- | libX11/nls/iso8859-1/XI18N_OBJS | 2 |
3 files changed, 4 insertions, 5 deletions
diff --git a/libX11/nls/C/XI18N_OBJS b/libX11/nls/C/XI18N_OBJS index 32e4f3588..3a9a1bb5a 100644 --- a/libX11/nls/C/XI18N_OBJS +++ b/libX11/nls/C/XI18N_OBJS @@ -3,6 +3,6 @@ # XI18N objects table for euro locales # XLC common/xlibi18n _XlcGenericLoader # XLC_open -XIM common/ximcp _XimOpenIM # XIM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister XOM common/xomGeneric _XomGenericOpenOM # XOM_open diff --git a/libX11/nls/en_US.UTF-8/XI18N_OBJS b/libX11/nls/en_US.UTF-8/XI18N_OBJS index f201bf435..97b30b976 100644 --- a/libX11/nls/en_US.UTF-8/XI18N_OBJS +++ b/libX11/nls/en_US.UTF-8/XI18N_OBJS @@ -3,6 +3,5 @@ # XI18N objects table for euro locales # XLC common/xlcUTF8Load _XlcUtf8Loader # XLC_open -XOM common/xomLTRTTB _XomGenericOpenOM # XOM_open -XIM common/xiiimp _SwitchOpenIM # XIM_open -XIM common/xiiimp _XimpLocalOpenIM # XIM_open +XOM common/xomGeneric _XomGenericOpenOM # XOM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister diff --git a/libX11/nls/iso8859-1/XI18N_OBJS b/libX11/nls/iso8859-1/XI18N_OBJS index 32e4f3588..3a9a1bb5a 100644 --- a/libX11/nls/iso8859-1/XI18N_OBJS +++ b/libX11/nls/iso8859-1/XI18N_OBJS @@ -3,6 +3,6 @@ # XI18N objects table for euro locales # XLC common/xlibi18n _XlcGenericLoader # XLC_open -XIM common/ximcp _XimOpenIM # XIM_open +XIM common/ximcp _XimOpenIM _XimRegisterIMInstantiateCallback _XimUnRegisterIMInstantiateCallback # XIM_open XIM_register XIM_unregister XOM common/xomGeneric _XomGenericOpenOM # XOM_open |