diff options
author | Determinant <[email protected]> | 2016-03-11 13:59:46 +0800 |
---|---|---|
committer | Determinant <[email protected]> | 2016-03-11 13:59:46 +0800 |
commit | e6d28de460dfd06d696d369119247179c7a7525d (patch) | |
tree | 6263fb1555ddcba962edc31ee1312679135c06c4 /lua/config.lua | |
parent | a32195e3e2ae9ca0f0c7a82e73e6bddb64568c05 (diff) | |
parent | f26288ba61d3d16866e1b227a71e7d9c46923436 (diff) |
Merge branch 'master' of https://github.com/liuq901/nerv into liuq901-master
Conflicts:
nerv/layer/init.lua
nerv/nn/layer_repo.lua
Diffstat (limited to 'lua/config.lua')
0 files changed, 0 insertions, 0 deletions