summaryrefslogtreecommitdiff
path: root/kaldi_io/src/kaldi/util
diff options
context:
space:
mode:
authorDeterminant <[email protected]>2016-02-29 22:02:32 +0800
committerDeterminant <[email protected]>2016-02-29 22:02:32 +0800
commite7c9175e1059a15720025a99ccdb35d5bf6dc30f (patch)
tree27f10d1f95116c9faf7b62a6524c235dd811aeb5 /kaldi_io/src/kaldi/util
parentd9e03b7d2c14549ab480d5e3b31518be4cdc8eed (diff)
parent24d56605428467e604afded423ba2ff49f2644e3 (diff)
Merge branch 'master' of https://github.com/sxkachilles/nerv-speech into sxkachilles-master
Conflicts: kaldi_decode/src/Makefile kaldi_io/src/cwrapper_kaldi.cpp
Diffstat (limited to 'kaldi_io/src/kaldi/util')
0 files changed, 0 insertions, 0 deletions