Revision 6968

Jump to revision:
Author:	gage
Date:	Wed Jul 20 18:26:17 2011 UTC (22 months ago)
Log Message:	fixed some conflict messages

Changed paths:

Path	Details
branches/gage_dev/pg/	modified , props changed
branches/gage_dev/pg/macros/PGbasicmacros.pl	modified , text changed

aubreyja at gmail dot com	ViewVC Help
Powered by ViewVC 1.0.9