mosesdecoder/moses-cmd
Barry Haddow 5a17ef82b3 Merge remote branch 'github/miramerge' into bjam
Conflicts:
	mira/Decoder.h
	mira/Main.cpp
	mira/Main.h
	moses-chart-cmd/src/IOWrapper.cpp
	moses-chart-cmd/src/Main.cpp
	moses-cmd/src/Main.cpp
	moses/src/BleuScoreFeature.cpp
	moses/src/BleuScoreFeature.h
	moses/src/TargetNgramFeature.h
2012-02-01 10:12:16 +00:00
..
src Merge remote branch 'github/miramerge' into bjam 2012-02-01 10:12:16 +00:00