Module Name:	pkgsrc
Committed By:	jschauma
Date:		Mon Jun  2 03:14:51 UTC 2003

Modified Files:
	pkgsrc/emulators/suse64_glx: Makefile
	pkgsrc/graphics/gtkglext: Makefile

Log Message:
Resolve conflicts from last commit.


To generate a diff of this commit:
cvs rdiff -r1.6 -r1.7 pkgsrc/emulators/suse64_glx/Makefile
cvs rdiff -r1.7 -r1.8 pkgsrc/graphics/gtkglext/Makefile

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