mirror of
https://github.com/X11Libre/xserver.git
synced 2026-03-24 01:34:11 +00:00
Merge branch 'master' into XACE-SELINUX
Conflicts: Xext/xace.c Xext/xace.h
This commit is contained in:
4
.gitignore
vendored
4
.gitignore
vendored
@@ -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
|
||||
|
||||
Reference in New Issue
Block a user