Commit Graph

2 Commits

Author SHA1 Message Date
fc16a68f48 Merge branch 'logical' into newpack
Conflicts:
	pkg/torch/TensorMathWrap.lua
2012-02-03 10:12:30 +01:00
053065ba23 initial revamp of torch7 tree 2012-01-25 14:55:20 +01:00