tree d90fd01e72f1fba11a90b84a494300ca2f6688d0
parent 42bbbd3ac79808a30216f68471d9656d1940e493
parent 601dca339647251c49f6e053d9544c286e5850e1
author ptrkrysik <ptrkrysik@gmail.com> 1434784921 +0200
committer ptrkrysik <ptrkrysik@gmail.com> 1434784921 +0200

Merge remote-tracking branch 'origin/romankh-master'
with implementation of AMR decoding

Conflicts:
	lib/decoding/tch_f_decoder_impl.cc
	lib/decoding/tch_f_decoder_impl.h