Merge remote-tracking branch 'origin/released'

* origin/released:
  fontconfig libXau mesa xserver xkeyboard-config git update 8 Apr 2013
  fontconfig mesa pixman xserver git update 25 Mar 2013
  libX11 mesa git update 18 Mar 2013
  fontconfig libX11 mesa pixman xserver xkeyboard-config git update 11 Mar 2013
  fontconfig libfontenc mesa xserver git update 6 Mar 2013
  Added xrdb app from git sources

Conflicts:
	xorg-server/Xext/sync.c

1 files changed, 79 insertions, 0 deletions

diff --git a/apps/xrdb/.gitignore b/apps/xrdb/.gitignore
new file mode 100644
index 000000000..0d6e60997
--- /dev/null
+++ b/apps/xrdb/.gitignore
@@ -0,0 +1,79 @@
+#
+#		X.Org module default exclusion patterns
+#		The next section if for module specific patterns
+#
+#	Do not edit the following section
+# 	GNU Build System (Autotools)
+aclocal.m4
+autom4te.cache/
+autoscan.log
+ChangeLog
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config-ml.in
+config.py
+config.status
+config.status.lineno
+config.sub
+configure
+configure.scan
+depcomp
+.deps/
+INSTALL
+install-sh
+.libs/
+libtool
+libtool.m4
+ltmain.sh
+lt~obsolete.m4
+ltoptions.m4
+ltsugar.m4
+ltversion.m4
+Makefile
+Makefile.in
+mdate-sh
+missing
+mkinstalldirs
+*.pc
+py-compile
+stamp-h?
+symlink-tree
+texinfo.tex
+ylwrap
+
+#	Do not edit the following section
+# 	Edit Compile Debug Document Distribute
+*~
+*.[0-9]
+*.[0-9]x
+*.bak
+*.bin
+core
+*.dll
+*.exe
+*-ISO*.bdf
+*-JIS*.bdf
+*-KOI8*.bdf
+*.kld
+*.ko
+*.ko.cmd
+*.lai
+*.l[oa]
+*.[oa]
+*.obj
+*.patch
+*.so
+*.pcf.gz
+*.pdb
+*.tar.bz2
+*.tar.gz
+#
+#		Add & Override patterns for xrdb 
+#
+#		Edit the following section as needed
+# For example, !report.pc overrides *.pc. See 'man gitignore'
+# 
+xrdb