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 /libXmu/doc/Xmu.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 'libXmu/doc/Xmu.xml')
-rw-r--r-- | libXmu/doc/Xmu.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/libXmu/doc/Xmu.xml b/libXmu/doc/Xmu.xml index bd79d6efc..8afe6882f 100644 --- a/libXmu/doc/Xmu.xml +++ b/libXmu/doc/Xmu.xml @@ -204,7 +204,7 @@ another round-trip to the server. <indexterm zone="XmuMakeAtom"> <primary><function>XmuMakeAtom</function></primary> </indexterm> - <funcsynopsis> + <funcsynopsis id='xmumakeatom'> <funcprototype> <funcdef>AtomPtr <function>XmuMakeAtom</function></funcdef> <paramdef>const char *<parameter>name</parameter></paramdef> @@ -233,7 +233,7 @@ can be used to cache the Atom value for one or more displays. <indexterm zone="XmuNameOfAtom"> <primary><function>XmuNameOfAtom</function></primary> </indexterm> - <funcsynopsis> + <funcsynopsis id='xmunameofatom'> <funcprototype> <funcdef>char *<function>XmuNameOfAtom</function></funcdef> <paramdef>AtomPtr <parameter>atom_ptr</parameter></paramdef> @@ -255,7 +255,7 @@ The function returns the name of an AtomPtr. <indexterm zone="XmuInternAtom"> <primary><function>XmuInternAtom</function></primary> </indexterm> - <funcsynopsis> + <funcsynopsis id='xmuinternatom'> <funcprototype> <funcdef>Atom <function>XmuInternAtom</function></funcdef> <paramdef>Display *<parameter>dpy</parameter></paramdef> @@ -291,7 +291,7 @@ such that subsequent requests do not cause another round-trip to the server. <indexterm zone="XmuGetAtomName"> <primary><function>XmuGetAtomName</function></primary> </indexterm> - <funcsynopsis> + <funcsynopsis id='xmugetatomname'> <funcprototype> <funcdef>char *<function>XmuGetAtomName</function></funcdef> <paramdef>Display *<parameter>dpy</parameter></paramdef> @@ -323,7 +323,7 @@ requests do not cause another round-trip to the server. <indexterm zone="XmuInternStrings"> <primary><function>XmuInternStrings</function></primary> </indexterm> - <funcsynopsis> + <funcsynopsis id='xmuinternstrings'> <funcprototype> <funcdef>void <function>XmuInternStrings</function></funcdef> <paramdef>Display *<parameter>dpy</parameter></paramdef> @@ -385,7 +385,7 @@ and link against the libXmu or libXmuu library. <indexterm zone="XmuPrintDefaultErrorMessage"> <primary><function>XmuPrintDefaultErrorMessage</function></primary> </indexterm> - <funcsynopsis> + <funcsynopsis id='xmuprintdefaulterrormessage'> <funcprototype> <funcdef>int <function>XmuPrintDefaultErrorMessage</function></funcdef> <paramdef>Display *<parameter>dpy</parameter></paramdef> |