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

1 files changed, 99 insertions, 0 deletions

diff --git a/fontconfig/.gitignore b/fontconfig/.gitignore
new file mode 100644
index 000000000..894a6a701
--- /dev/null
+++ b/fontconfig/.gitignore
@@ -0,0 +1,99 @@
+tags
+TAGS
+*.tar.gz
+.libs
+.deps
+*.o
+*.lo
+*.la
+*~
+*.orig
+*.rej
+ChangeLog
+ChangeLog-*
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+fontconfig-zip
+fontconfig.pc
+fontconfig.spec
+fonts.conf
+install-sh
+doltcompile
+libtool
+ltmain.sh
+missing
+stamp-h1
+manpage.log
+doc/*.3
+doc/confdir.sgml
+doc/edit-sgml
+doc/fcatomic.sgml
+doc/fcblanks.sgml
+doc/fccache.sgml
+doc/fccharset.sgml
+doc/fcconfig.sgml
+doc/fcconstant.sgml
+doc/fcdircache.sgml
+doc/fcfile.sgml
+doc/fcformat.sgml
+doc/fcfontset.sgml
+doc/fcfreetype.sgml
+doc/fclangset.sgml
+doc/fcinit.sgml
+doc/fcmatrix.sgml
+doc/fcobjectset.sgml
+doc/fcobjecttype.sgml
+doc/fcpattern.sgml
+doc/fcstring.sgml
+doc/fcstrset.sgml
+doc/fcvalue.sgml
+doc/fontconfig-devel.pdf
+doc/fontconfig-devel.txt
+doc/fontconfig-devel
+doc/fontconfig-user.html
+doc/fontconfig-user.pdf
+doc/fontconfig-user.txt
+doc/fonts-conf.5
+doc/func.refs
+doc/local-fontconfig-devel.sgml
+doc/local-fontconfig-user.sgml
+doc/version.sgml
+doc/devel-man
+fc-arch/fc-arch
+fc-arch/fcarch.h
+fc-cache/fc-cache
+fc-cache/fc-cache.1
+fc-case/fc-case
+fc-case/fccase.h
+fc-cat/fc-cat
+fc-cat/fc-cat.1
+fc-glyphname/fc-glyphname
+fc-glyphname/fcglyphname.h
+fc-lang/fc-lang
+fc-lang/fclang.h
+fc-list/fc-list
+fc-list/fc-list.1
+fc-match/fc-match
+fc-match/fc-match.1
+fc-pattern/fc-pattern
+fc-pattern/fc-pattern.1
+fc-query/fc-query
+fc-query/fc-query.1
+fc-scan/fc-scan
+fc-scan/fc-scan.1
+src/fcarch
+src/fontconfig.def
+fcalias.h
+fcaliastail.h
+src/fcftalias.h
+src/fcftaliastail.h