------------------------------------------------------------ revno: 1898 committer: Václav Šmilauer <[email protected]> branch nick: trunk timestamp: Sun 2009-12-13 21:46:46 +0100 message: 1. Fix renaming conflict (InteractingSphere->Sphere shadowed by older Sphere->SphereModel) modified: py/system.py
-- lp:yade https://code.launchpad.net/~yade-dev/yade/trunk Your team Yade developers is subscribed to branch lp:yade. To unsubscribe from this branch go to https://code.launchpad.net/~yade-dev/yade/trunk/+edit-subscription.
=== modified file 'py/system.py' --- py/system.py 2009-12-13 20:30:13 +0000 +++ py/system.py 2009-12-13 20:46:46 +0000 @@ -56,9 +56,9 @@ 'NewtonsDampedLaw':'NewtonIntegrator', # Wed Dec 9 17:44:15 2009, vac...@flux 'StandAloneEngine':'GlobalEngine', # Wed Dec 9 17:46:12 2009, vac...@flux 'DeusExMachina':'PartialEngine', # Wed Dec 9 17:53:06 2009, vac...@flux - 'Sphere':'SphereModel', # 11/12/2009, vac...@flux - 'Facet':'FacetModel', # Fri Dec 11 15:27:41 2009, vac...@flux - 'Box':'BoxModel', # Fri Dec 11 15:39:44 2009, vac...@flux + ## 'Sphere':'SphereModel', # 11/12/2009, vac...@flux ### comment out to prevent loop, since InteractingSphere was renamed to Sphere later + ## 'Facet':'FacetModel', # Fri Dec 11 15:27:41 2009, vac...@flux ### dtto + ## 'Box':'BoxModel', # Fri Dec 11 15:39:44 2009, vac...@flux ### dtto 'GLDrawSphere':'GLDrawSphereModel', # Fri Dec 11 15:43:31 2009, vac...@flux 'GLDrawBox':'GLDrawBoxModel', # Fri Dec 11 15:43:50 2009, vac...@flux 'GLDrawFacet':'GLDrawFacetModel', # Fri Dec 11 15:44:04 2009, vac...@flux
_______________________________________________ Mailing list: https://launchpad.net/~yade-dev Post to : [email protected] Unsubscribe : https://launchpad.net/~yade-dev More help : https://help.launchpad.net/ListHelp
