https://github.com/Microsoft/CNTK
Revision 8705dd0f0243647248b0894a44841469b5a435c6 authored by Frank Seide on 02 September 2015, 17:12:15 UTC, committed by Frank Seide on 02 September 2015, 17:12:15 UTC
Conflicts:
	DataReader/HTKMLFReader/ssematrix.h
	Math/Math/CUDAPageLockedMemAllocator.cpp
	Math/Math/Matrix.cpp
	Math/Math/NoGPU.cpp
	Math/Math/ValueQuantizer.h
2 parent s 67464d2 + cf0d15a
History
Tip revision: 8705dd0f0243647248b0894a44841469b5a435c6 authored by Frank Seide on 02 September 2015, 17:12:15 UTC
Merge remote-tracking branch 'origin' into fseide/bs
Tip revision: 8705dd0

back to top