Subject: CVS commit: wip/glut
From: Pierre Allegraud
Date: 2010-01-03 16:08:44
Message id: E1NRS4h-0001qK-LZ@sfp-cvsdas-2.v30.ch3.sourceforge.com

Log Message:
Merge conflicts...

Files:
RevisionActionfile
1.5modifywip/glut/DESCR
1.10modifywip/glut/Makefile
1.7modifywip/glut/PLIST
1.6modifywip/glut/buildlink3.mk