diff options
author | Ronan Collobert <ronan@collobert.com> | 2012-01-30 19:54:41 +0400 |
---|---|---|
committer | Ronan Collobert <ronan@collobert.com> | 2012-01-30 19:54:41 +0400 |
commit | e78f57d33895dde4f80de3228b3b899e31c8570b (patch) | |
tree | e283cd075a6f7d922783acb2604e618e288ffe2a | |
parent | 2a14c8223f3d6b8a1cd0760494536822e6a6e9a9 (diff) |
Merge branch 'master' into newpack
Conflicts:
extra/nn/test/test.lua
-rw-r--r-- | inline.lua | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -79,6 +79,7 @@ local function uncleanText(txt) end local function string2symbol(str) + local str = str:gsub(':','.') local ok, res = pcall(loadstring('local t = ' .. str .. '; return t')) if not ok then ok, res = pcall(loadstring('local t = _torchimport.' .. str .. '; return t')) |