Merge branch 'master' into XACE-SELINUX

Conflicts:

	Xext/xace.c
	Xext/xace.h
This commit is contained in:
Eamon Walsh
2007-11-14 13:35:50 -05:00
committed by Eamon Walsh
35 changed files with 672 additions and 634 deletions

4
.gitignore vendored
View File

@@ -8,6 +8,9 @@ Makefile.in
*.a
*.o
*~
.*.swp
obj*
build*
aclocal.m4
autom4te.cache
compile
@@ -296,4 +299,3 @@ mfb/mfbteblack.c
mfb/mfbtewhite.c
mfb/mfbtileC.c
mfb/mfbtileG.c
.*.swp