• Ondrej Platek's avatar
    Merge branch 'master' into sandbox-oplatek · 817ce77d
    Ondrej Platek authored
    Conflicts:
    	.gitignore
    	INSTALL
    	README.txt
    	egs/babel/s5/local/generate_proxy_keywords.sh
    	egs/wsj/s5/steps/train_nnet_cpu.sh
    	egs/wsj/s5/utils/nnet-cpu/make_nnet_config_preconditioned.pl
    	src/Makefile
    	src/configure
    	src/lat/Makefile
    	src/makefiles/cygwin.mk
    	src/makefiles/darwin_10_5.mk
    	src/makefiles/darwin_10_6.mk
    	src/makefiles/darwin_10_7.mk
    	src/makefiles/darwin_10_8.mk
    	src/makefiles/linux_atlas.mk
    	src/makefiles/linux_atlas_64bit.mk
    	src/makefiles/linux_clapack.mk
    	src/makefiles/linux_openblas.mk
    	src/nnet-cpu/mixup-nnet.cc
    	src/nnet-cpu/nnet-component-test.cc
    	src/nnet-cpu/nnet-component.cc
    	src/nnet-cpu/nnet-component.h
    	src/nnet-cpu/nnet-nnet.cc
    	src/nnet-cpu/nnet-nnet.h
    	src/nnet-cpu/nnet-update-parallel.cc
    	src/nnet-cpu/nnet-update-parallel.h
    	src/nnet-cpubin/nnet-train-parallel.cc
    	src/nnet/nnet-pdf-prior.h
    	src/nnetbin/nnet-forward.cc
    	tools/Makefile
    	tools/extras/install_portaudio.sh
    
    git-svn-id: https://svn.code.sf.net/p/kaldi/code/sandbox/oplatek@2520 5e6a8d80-dfce-4ca6-a32a-6e07a63d50c8
    817ce77d
INSTALL 258 Bytes