]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - processor-sdk/kaldi.git/commitdiff
Merge remote-tracking branch 'upstream/master' into shortcut
authorDaniel Povey <dpovey@gmail.com>
Wed, 18 Jan 2017 21:32:21 +0000 (16:32 -0500)
committerDaniel Povey <dpovey@gmail.com>
Wed, 18 Jan 2017 21:32:21 +0000 (16:32 -0500)
Conflicts:
src/nnet3/nnet-computation.cc


Trivial merge