mosesdecoder/OnDiskPt
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
..
OnDiskPt.xcodeproj Merge branch 'master' into miramerge. 2011-10-28 15:54:23 +01:00
src Changes to chart decoder cube pruning: create one cube per dotted rule 2011-06-27 15:13:15 +00:00
OnDiskPt.vcxproj visual studio 2011-10-14 10:50:08 +00:00