Merge remote-tracking branch 'alanc/master'

This commit is contained in:
Keith Packard 2011-10-03 11:49:23 -07:00
commit 9a55b3661b
7 changed files with 13 additions and 28 deletions

1
dix/.gitignore vendored
View file

@ -1,2 +1,3 @@
# Add & Override for this directory and it's subdirectories
Xserver-dtrace.h
dix.O