From: Kevin M. <sub...@us...> - 2001-10-10 05:09:38
|
subatomic 2001/10/09 22:09:37 PDT Modified files: . ObjImporter.h Log: oops, I resolved the conflict incorrectly (should be GeodePtr&, not shared_ptr<Geode>) Revision Changes Path 1.16 +3 -3 tank/ObjImporter.h http://cvs.sourceforge.net/cgi-bin/viewcvs.cgi/isugamedev/tank/ObjImporter.h.diff?r1=1.15&r2=1.16 |