aboutsummaryrefslogtreecommitdiff
path: root/libX11/nls/iso8859-2/XI18N_OBJS
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2012-06-08 14:29:46 +0200
committermarha <marha@users.sourceforge.net>2012-06-08 14:50:37 +0200
commit72ec0e3bb2d7fc6b77b2a75873792f781679da6a (patch)
tree0a736ab9a8c26276929ab077dc661e3625b54884 /libX11/nls/iso8859-2/XI18N_OBJS
parent5e865910f0ce672295bd60460631339be5e311a0 (diff)
parent990bc3f015a4f8fce2eb918375defcd44980a845 (diff)
downloadvcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.gz
vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.tar.bz2
vcxsrv-72ec0e3bb2d7fc6b77b2a75873792f781679da6a.zip
Merge remote-tracking branch 'origin/released'
Conflicts: fontconfig/.gitignore libX11/src/ConvSel.c libX11/src/CrGlCur.c libX11/src/CrWindow.c libX11/src/GetDflt.c libX11/src/Window.c libX11/src/xlibi18n/XimProto.h libX11/src/xlibi18n/lcDynamic.c libxcb/src/.gitignore libxcb/src/xcb_ext.c libxcb/src/xcb_xid.c mesalib/src/glsl/.gitignore mesalib/src/glsl/glcpp/.gitignore mesalib/src/mapi/glapi/gen/glX_API.xml mesalib/src/mapi/glapi/glapi_getproc.c mesalib/src/mesa/main/.gitignore mesalib/src/mesa/main/syncobj.c mesalib/src/mesa/program/.gitignore xkbcomp/listing.c xkbcomp/xkbpath.c xorg-server/.gitignore xorg-server/Xext/xvmain.c xorg-server/dix/dispatch.c xorg-server/hw/xwin/glx/winpriv.h xorg-server/hw/xwin/winprefsyacc.y xorg-server/hw/xwin/winscrinit.c xorg-server/xkeyboard-config/rules/bin/ml1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v1_s.sh xorg-server/xkeyboard-config/rules/bin/ml1v_s.sh xorg-server/xkeyboard-config/rules/bin/ml_s.sh xorg-server/xkeyboard-config/rules/bin/mlv_s.sh xorg-server/xkeyboard-config/rules/compat/.gitignore
Diffstat (limited to 'libX11/nls/iso8859-2/XI18N_OBJS')
-rw-r--r--libX11/nls/iso8859-2/XI18N_OBJS16
1 files changed, 8 insertions, 8 deletions
diff --git a/libX11/nls/iso8859-2/XI18N_OBJS b/libX11/nls/iso8859-2/XI18N_OBJS
index f20902a61..daac7d36c 100644
--- a/libX11/nls/iso8859-2/XI18N_OBJS
+++ b/libX11/nls/iso8859-2/XI18N_OBJS
@@ -1,8 +1,8 @@
-# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
-#
-# XI18N objects table for euro locales
-#
-XLC common/xlibi18n _XlcGenericLoader # XLC_open
-XIM common/xiiimp _XimpLocalOpenIM # XIM_open
-XOM common/xomGeneric _XomGenericOpenOM # XOM_open
-
+# CATEGORY(XLC|XIM|OM) SHARED_LIBRARY_NAME FUNCTION_NAME
+#
+# XI18N objects table for euro locales
+#
+XLC common/xlibi18n _XlcGenericLoader # XLC_open
+XIM common/xiiimp _XimpLocalOpenIM # XIM_open
+XOM common/xomGeneric _XomGenericOpenOM # XOM_open
+