diff options
| author | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-06-05 16:04:18 +0200 |
| commit | 097c0d8400d976c5c372db576a11764e87994c7f (patch) | |
| tree | b5f977f9277f70f94f22ef221602ed318592a912 /libX11/specs/i18n/trans/trans.xml | |
| parent | 03fa24f76277662240d0af8770e168fc38b533cb (diff) | |
| parent | 0e1ac54142d49051da9a74f37a792225a4e8d7b0 (diff) | |
| download | vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.gz vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.tar.bz2 vcxsrv-097c0d8400d976c5c372db576a11764e87994c7f.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
libX11/specs/i18n/trans/trans.xml
mesalib/src/glsl/glsl_parser_extras.cpp
mesalib/src/glsl/ir_print_visitor.cpp
xorg-server/xkeyboard-config/rules/base.xml.in
xorg-server/xkeyboard-config/rules/xkb.dtd
xorg-server/xkeyboard-config/symbols/de
Diffstat (limited to 'libX11/specs/i18n/trans/trans.xml')
| -rw-r--r-- | libX11/specs/i18n/trans/trans.xml | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/libX11/specs/i18n/trans/trans.xml b/libX11/specs/i18n/trans/trans.xml index 5018c9192..a61be65bc 100644 --- a/libX11/specs/i18n/trans/trans.xml +++ b/libX11/specs/i18n/trans/trans.xml @@ -359,7 +359,7 @@ connection is established successfully, this function returns True. The Alternative Entry for this function is:
</para>
-<funcsynopsis>
+<funcsynopsis id='_ximconnect'>
<funcprototype>
<funcdef>Bool <function> _XimConnect</function></funcdef>
<paramdef>XIM<parameter> im</parameter></paramdef>
@@ -419,7 +419,7 @@ connection is closed successfully, this function returns True. The Alternative Entry for this function is:
</para>
-<funcsynopsis>
+<funcsynopsis id='_ximshutdown'>
<funcprototype>
<funcdef>Bool <function>_XimShutdown</function></funcdef>
<paramdef>XIM<parameter> im</parameter></paramdef>
@@ -448,7 +448,7 @@ The following function is called, when Xlib needs to write data to the IM Server.
</para>
-<funcsynopsis>
+<funcsynopsis id='_ximwrite'>
<funcprototype>
<funcdef>Bool <function> _XimWrite</function></funcdef>
<paramdef>XIM<parameter> im</parameter></paramdef>
@@ -549,7 +549,7 @@ The following function is called when Xlib waits for response from IM server synchronously.
</para>
-<funcsynopsis>
+<funcsynopsis id='_ximread'>
<funcprototype>
<funcdef>Bool <function> _XimRead</function></funcdef>
<paramdef>XIM<parameter> im</parameter></paramdef>
@@ -788,7 +788,7 @@ transport layer. If data transfer is completed, the function returns True. The Alternative Entry for this function is:
</para>
-<funcsynopsis>
+<funcsynopsis id='_ximflush'>
<funcprototype>
<funcdef>void <function> _XimFlush</function></funcdef>
<paramdef>XIM<parameter> im</parameter></paramdef>
@@ -943,7 +943,7 @@ that the data has been processed by the upper layer. The Alternative Entry for this function is:
</para>
-<funcsynopsis>
+<funcsynopsis id='_ximregisterdispatcher'>
<funcprototype>
<funcdef>Bool <function> _XimRegisterDispatcher</function></funcdef>
<paramdef>XIM<parameter> im</parameter></paramdef>
@@ -1052,7 +1052,7 @@ Protocol packet unit or not. The Alternative Entry for this function is:
</para>
-<funcsynopsis>
+<funcsynopsis id='_ximcalldispatcher'>
<funcprototype>
<funcdef>Bool <function> _XimCallDispatcher</function></funcdef>
<paramdef>XIM<parameter> im</parameter></paramdef>
|