Index: ChangeLog
===================================================================
RCS file: /cvs/xorg/xc/ChangeLog,v
retrieving revision 1.369.2.2
retrieving revision 1.369.2.3
diff -u -r1.369.2.2 -r1.369.2.3
--- ChangeLog	17 Sep 2004 08:58:19 -0000	1.369.2.2
+++ ChangeLog	4 Nov 2004 13:18:42 -0000	1.369.2.3
@@ -1,3 +1,9 @@
+2004-11-04  Alexander Gottwald  <ago at freedesktop dot org>
+
+	* xc/programs/Xserver/Imakefile:
+	Link XWin.exe and XWin_GL.exe with binmode.o to make sure all files
+	are read without \r\n conversion
+
 2004-09-15  Daniel Stone  <daniel@freedesktop.org>
 
 	* xc/extras/Xpm/lib/Attrib.c:
Index: programs/Xserver/Imakefile
===================================================================
RCS file: /cvs/xorg/xc/programs/Xserver/Imakefile,v
retrieving revision 1.1.4.2.2.11
retrieving revision 1.1.4.2.2.12
diff -u -r1.1.4.2.2.11 -r1.1.4.2.2.12
--- programs/Xserver/Imakefile	15 Sep 2004 16:33:23 -0000	1.1.4.2.2.11
+++ programs/Xserver/Imakefile	4 Nov 2004 13:18:43 -0000	1.1.4.2.2.12
@@ -1019,7 +1019,8 @@
 XWINOBJS = $(XWINDDXDIR)/stubs.o $(XWINDDXDIR)/XWin.res
 XWINLIBS = PreFbLibs $(XWINLIB) FbPostFbLibs $(XWINLIB) $(XWINLAYERLIB) \
            $(SHADOW) $(XWINPARSERLIB) $(ROOTLESSLIB)
-XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XONLYLIB) $(SYSLIBS) -lgdi32
+XWINSYSLIBS = $(FONTLIBS) $(LDPRELIBS) $(XONLYLIB) $(SYSLIBS) -lgdi32 \
+           -lbinmode
 
 EXTRA_LDOPTIONS = -e _mainCRTStartup