Merge branch 'master' of git+ssh://git.freedesktop.org/git/xcb

diff --git a/.gitignore b/.gitignore
index ed62141..0e6c05b 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,20 +1 @@
-Makefile
-Makefile.in
-aclocal.m4
-autom4te.cache
-compile
-config.guess
-config.log
-config.status
-config.sub
-configure
 configure.lineno
-depcomp
-install-sh
-libtool
-ltmain.sh
-missing
-mkinstalldirs
-*.pc
-*.tar.bz2
-*.tar.gz

diff --git a/src/.gitignore b/src/.gitignore
index f3e1232..1b0d39b 100644 (file)
--- a/src/.gitignore
+++ b/src/.gitignore
@@ -1,14 +1,3 @@
-.deps
-.libs
-Makefile
-Makefile.in
-config.h
-config.h.in
-stamp-h1
-*.lo
-*.loT
-*.la
-*.o
 xproto.c
 xproto.h
 xcb_des.c
@@ -16,4 +5,3 @@ xcb_types.c
 xcb_types.h
 extensions
 X11
-check_all

diff --git a/tests/.gitignore b/tests/.gitignore
index a633f9c..9d27cc5 100644 (file)
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1,7 +1,3 @@
-.libs
-.deps
-*.o
-Makefile.in
 CheckLog.html
 CheckLog_xcb.xml
 check_all