summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2016-03-17 10:51:21 +0800
committerDeterminant <[email protected]>2016-03-17 10:51:21 +0800
commit284d9f3fe3f7017e677fac03b2bc134892875515 (patch)
treefb3bb0d210d6cd347f60098faeeeb8afc70fd6c5 /Makefile
parent00211587988024e34370e7ec2ee1cb1c8632f116 (diff)
parentf1656ade78ac71d4cd84f1f7a539d1845b137589 (diff)
Merge branch 'master' of github.com:liuq901/nerv into liuq901-master
Conflicts: nerv/layer/rnn.lua
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions