mosesdecoder/moses-chart-cmd
Barry Haddow 90820ad0c5 Merge branch 'master' into miramerge.
Also fix mert-moses.pl to use correct flag for specifying
weights of non-core features.

Conflicts:
	.gitignore
	configure.in
	ltmain.sh
	moses/src/LM/Factory.cpp
	moses/src/LMList.cpp
	moses/src/LMList.h
	moses/src/LanguageModel.cpp
	moses/src/LanguageModel.h
	moses/src/LanguageModelKen.h
	moses/src/Makefile.am
	moses/src/Manager.cpp
	moses/src/PhraseDictionaryMemory.cpp
	moses/src/PhraseDictionaryTree.cpp
	moses/src/StaticData.cpp
	moses/src/TargetPhrase.h
2011-10-28 15:54:23 +01:00
..
moses-chart-cmd.xcodeproj xcode 2011-10-24 14:44:36 +07:00
src Merge branch 'master' into miramerge 2011-10-12 17:14:23 +01:00
moses-chart-cmd.vcxproj win32 2011-10-23 09:37:47 +07:00