Merge remote-tracking branch 'origin/released'

* origin/released:
  libX11 mesa git update 18 Mar 2013
  fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar 2013

7 files changed, 14 insertions, 0 deletions

diff --git a/libX11/man/XrmEnumerateDatabase.man b/libX11/man/XrmEnumerateDatabase.man
index 843100635..03c0f30e2 100644
--- a/libX11/man/XrmEnumerateDatabase.man
+++ b/libX11/man/XrmEnumerateDatabase.man
@@ -84,6 +84,8 @@
 .SH NAME
 XrmEnumerateDatabase \- enumerate resource database entries
 .SH SYNTAX
+.HP
+#include <X11/Xresource.h>
 .TS
 lw(.5i) lw(2i) lw(2.5i).
 T{
diff --git a/libX11/man/XrmGetFileDatabase.man b/libX11/man/XrmGetFileDatabase.man
index 3a8a6fa82..71ddd9f10 100644
--- a/libX11/man/XrmGetFileDatabase.man
+++ b/libX11/man/XrmGetFileDatabase.man
@@ -93,6 +93,8 @@
 XrmGetFileDatabase, XrmPutFileDatabase, XrmGetStringDatabase, XrmLocaleOfDatabase, XrmGetDatabase, XrmSetDatabase, XrmDestroyDatabase \- retrieve and store resource databases
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 XrmDatabase XrmGetFileDatabase\^(\^char *\fIfilename\fP\^); 
 .HP
 void XrmPutFileDatabase\^(\^XrmDatabase \fIdatabase\fP\^, char
diff --git a/libX11/man/XrmGetResource.man b/libX11/man/XrmGetResource.man
index 76ca9218c..ef2cf9ada 100644
--- a/libX11/man/XrmGetResource.man
+++ b/libX11/man/XrmGetResource.man
@@ -85,6 +85,8 @@
 XrmGetResource, XrmQGetResource, XrmQGetSearchList, XrmQGetSearchResource \- retrieve database resources and search lists
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 Bool XrmGetResource\^(\^XrmDatabase \fIdatabase\fP\^, char *\fIstr_name\fP\^,
 char *\fIstr_class\fP\^, char **\fIstr_type_return\fP\^, XrmValue
 *\fIvalue_return\fP\^); 
diff --git a/libX11/man/XrmInitialize.man b/libX11/man/XrmInitialize.man
index b8b549db6..3b3ddd78b 100644
--- a/libX11/man/XrmInitialize.man
+++ b/libX11/man/XrmInitialize.man
@@ -83,6 +83,8 @@
 XrmInitialize, XrmParseCommand, XrmValue, XrmOptionKind, XrmOptionDescRec \- initialize the Resource Manager, Resource Manager structures, and parse the command line
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 void XrmInitialize\^(void\^);
 .HP
 void XrmParseCommand\^(\^XrmDatabase *\fIdatabase\fP\^, XrmOptionDescList
diff --git a/libX11/man/XrmMergeDatabases.man b/libX11/man/XrmMergeDatabases.man
index 57a6578ec..41b27bb63 100644
--- a/libX11/man/XrmMergeDatabases.man
+++ b/libX11/man/XrmMergeDatabases.man
@@ -83,6 +83,8 @@
 XrmMergeDatabases, XrmCombineDatabase, XrmCombineFileDatabase \- merge resource databases
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 void XrmMergeDatabases(\^XrmDatabase \fIsource_db\fP, XrmDatabase
 *\fItarget_db\fP\^); 
 .HP
diff --git a/libX11/man/XrmPutResource.man b/libX11/man/XrmPutResource.man
index 9f9d08884..fd644630d 100644
--- a/libX11/man/XrmPutResource.man
+++ b/libX11/man/XrmPutResource.man
@@ -83,6 +83,8 @@
 XrmPutResource, XrmQPutResource, XrmPutStringResource, XrmQPutStringResource, XrmPutLineResource \- store database resources
 .SH SYNTAX
 .HP
+#include <X11/Xresource.h>
+.HP
 void XrmPutResource\^(\^XrmDatabase *\fIdatabase\fP\^, char
 *\fIspecifier\fP\^, char *\fItype\fP\^, XrmValue *\fIvalue\fP\^); 
 .HP
diff --git a/libX11/man/XrmUniqueQuark.man b/libX11/man/XrmUniqueQuark.man
index 383d26c50..93755f71b 100644
--- a/libX11/man/XrmUniqueQuark.man
+++ b/libX11/man/XrmUniqueQuark.man
@@ -83,6 +83,8 @@
 XrmUniqueQuark, XrmStringToQuark, XrmPermStringToQuark, XrmQuarkToString, XrmStringToQuarkList, XrmStringToBindingQuarkList \- manipulate resource quarks
 .SH SYNOPSIS
 .HP
+#include <X11/Xresource.h>
+.HP
 XrmQuark XrmUniqueQuark\^(void); 
 .LP
 \&#define XrmStringToName(string) XrmStringToQuark(string)