xserver: Branch 'xorg-server-1.4-apple'

[Jeremy Huddleston]

 .gitignore |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

New commits:
commit 06964c322e4da81f3146022049a2de13f6b2892d
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Tue Dec 23 12:57:50 2008 -0800

    Updated .gitignore

diff --git a/.gitignore b/.gitignore
index 36ade02..c65f4a6 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,4 @@
+ChangeLog
 Makefile
 Makefile.in
 .deps
@@ -275,11 +276,12 @@ hw/xprint/doc/Xprt.1x
 hw/xprint/doc/Xprt.man
 hw/xprint/dpmsstubs-wrapper.c
 hw/xprint/miinitext-wrapper.c
+hw/xquartz/bundle/Info.plist
 hw/xquartz/mach-startup/mach_startup.h
 hw/xquartz/mach-startup/mach_startupServer.c
 hw/xquartz/mach-startup/mach_startupServer.h
 hw/xquartz/mach-startup/mach_startupUser.c
-hw/xquartz/mach-startup/X11
+hw/xquartz/mach-startup/X11.bin
 hw/xquartz/mach-startup/Xquartz
 hw/xquartz/doc/Xquartz.1
 include/dix-config.h