Merge branch 'master' of https://github.com/OAID/caffeOnACL
authorYao Honggui <honggui@openailan.com>
Fri, 2 Jun 2017 12:34:17 +0000 (20:34 +0800)
committerYao Honggui <honggui@openailan.com>
Fri, 2 Jun 2017 12:34:17 +0000 (20:34 +0800)
commit0a7c22b864b6a8dcc2b6ae98b448edcbaa7bf195
tree6dce3b1cca62576c9f4107550e2326f0e82f08bb
parent793bd96351749cb8df16f1581baf3e7d8036ac37
parentf42860e148cf78aa0ae3859d7b36685c8e7fcbfc
Merge branch 'master' of https://github.com/OAID/caffeOnACL

# Conflicts:
# LICENSE