CVS commit: wip/glut

["Pierre Allegraud" <pallegra%users.sourceforge.net@localhost>]

Module name:    wip
Committed by:   pallegra
Date:           Sun Jan  3 15:08:44 UTC 2010

Modified Files:
        wip/glut: DESCR Makefile PLIST buildlink3.mk

Log Message:
Merge conflicts...


To generate a diff of this commit:
cvs -z3 rdiff -u -r1.4 -r1.5 wip/glut/DESCR
cvs -z3 rdiff -u -r1.5 -r1.6 wip/glut/buildlink3.mk
cvs -z3 rdiff -u -r1.6 -r1.7 wip/glut/PLIST
cvs -z3 rdiff -u -r1.9 -r1.10 wip/glut/Makefile

To view a diff of this commit:
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/glut/DESCR?r1=1.4&r2=1.5
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/glut/buildlink3.mk?r1=1.5&r2=1.6
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/glut/PLIST?r1=1.6&r2=1.7
http://pkgsrc-wip.cvs.sourceforge.net/pkgsrc-wip/wip/glut/Makefile?r1=1.9&r2=1.10

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

------------------------------------------------------------------------------
This SF.Net email is sponsored by the Verizon Developer Community
Take advantage of Verizon's best-in-class app development support
A streamlined, 14 day to market process makes app distribution fast and easy
Join now and get one step closer to millions of Verizon customers
http://p.sf.net/sfu/verizon-dev2dev 
_______________________________________________
pkgsrc-wip-cvs mailing list
pkgsrc-wip-cvs%lists.sourceforge.net@localhost
https://lists.sourceforge.net/lists/listinfo/pkgsrc-wip-cvs