Qiwei Ye d17ff5d9eb Merge branch 'master' into qiwye/asgd-dev ... Conflicts: Source/CNTK/CNTK.cpp Source/SGDLib/SGD.cpp Source/SGDLib/SGD.h		2016-06-15 20:22:12 +08:00
..
Actions.h	changed 01_OneHidden to BrainScript & dealt with fallout	2016-06-06 18:22:10 -07:00
ActionsLib.vcxproj	…
ActionsLib.vcxproj.filters	…
EvalActions.cpp	temporarily hiding BrainScript in MNIST 01_ example	2016-06-08 19:10:12 -07:00
NDLNetworkBuilder.cpp	Removed MaxPoolingMaskNode	2016-06-14 09:58:16 -07:00
NDLNetworkBuilder.h	…
NDLUtil.h	…
NetworkDescriptionLanguage.cpp	Removed MaxPoolingMaskNode	2016-06-14 09:58:16 -07:00
NetworkDescriptionLanguage.h	…
NetworkFactory.cpp	(removed debug code)	2016-06-09 17:59:25 -07:00
OtherActions.cpp	…
SimpleNetworkBuilder.cpp	…
SimpleNetworkBuilder.h	…
SpecialPurposeActions.cpp	…
SynchronousExecutionEngine.h	…
TrainActions.cpp	Do not overwrite 'traceLevel' in the reader config section	2016-06-01 13:55:02 +02:00