diff datasets/ftfile.py @ 513:66a905508e34

resolved merge conflict
author Yoshua Bengio <bengioy@iro.umontreal.ca>
date Tue, 01 Jun 2010 14:05:02 -0400
parents a92ec9939e4f
children 5e481b224117
line wrap: on
line diff