diff data_generation/__init__.py @ 533:22d5cd82d5f0

resolved conflit
author Yoshua Bengio <bengioy@iro.umontreal.ca>
date Tue, 01 Jun 2010 21:24:39 -0400
parents 72eee6a9f43f
children
line wrap: on
line diff