Module Name:	src
Committed By:	tron
Date:		Wed Apr  6 20:52:08 UTC 2005

Modified Files:
	src/x11/Xserver/GL/glx [netbsd-3]: Makefile.glx
	src/x11/bin/twm [netbsd-3]: Makefile

Log Message:
Pull up revision 1.6 (requested by jmc in ticket #114):
Adjust for the latest XFree86 import. Code now compiles, but libraries
might be incomplete and sets are definitely still broken.


To generate a diff of this commit:
cvs rdiff -r1.5 -r1.5.8.1 src/x11/Xserver/GL/glx/Makefile.glx
cvs rdiff -r1.5 -r1.5.4.1 src/x11/bin/twm/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.