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

[Jeremy Huddleston]

 hw/xquartz/mach-startup/Makefile.am |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

New commits:
commit 73db1170129a31ad2d55a7e83ac6dfc8030e47f1
Author: Jeremy Huddleston <jeremyhu at freedesktop.org>
Date:   Fri Aug 29 21:16:19 2008 -0700

    XQuartz: Placate automake which doesn't like escaped newlines even in comments...

diff --git a/hw/xquartz/mach-startup/Makefile.am b/hw/xquartz/mach-startup/Makefile.am
index 3678c19..c5df790 100644
--- a/hw/xquartz/mach-startup/Makefile.am
+++ b/hw/xquartz/mach-startup/Makefile.am
@@ -22,7 +22,7 @@ X11_LDADD = \
 	$(DARWIN_LIBS) $(XSERVER_LIBS) $(XSERVER_SYS_LIBS) -lXplugin -lX11
 
 #	$(top_builddir)/hw/xquartz/GL/libCGLCore.la \
-#	$(top_builddir)/glx/libglx.la \
+#	$(top_builddir)/glx/libglx.la
 
 X11_LDFLAGS =  \
 	-XCClinker -Objc \