Ulrich Germann 7c145d045b Merge branch 'master' into dynamic-phrase-tables ... Conflicts: contrib/server/Jamfile contrib/server/mosesserver.cpp		2014-04-28 10:00:07 +01:00
..
IOWrapper.cpp	Reformatting for readability. In ReadInput: delete source only if non-NULL.	2014-03-11 13:53:54 +00:00
IOWrapper.h	delete includes for util/check.hh	2013-11-21 18:58:28 +00:00
Jamfile	Work on compression and defaults for outputting hypergraphs.	2013-03-21 16:48:47 -04:00
LatticeMBR.cpp	move moses-cmd/src/* to moses-cmd/	2012-11-12 20:42:29 +00:00
LatticeMBR.h	move moses-cmd/src/* to moses-cmd/	2012-11-12 20:42:29 +00:00
LatticeMBRGrid.cpp	UTIL_THROW_IF -> UTIL_THROW_IF2	2013-11-22 20:27:46 +00:00
Main.cpp	Merge branch 'master' into dynamic-phrase-tables	2014-04-28 10:00:07 +01:00
Main.h	move moses-cmd/src/* to moses-cmd/	2012-11-12 20:42:29 +00:00
mbr.cpp	use GetWeightedScore() instead of InnerProduct(...)	2013-05-02 10:30:20 +01:00
mbr.h	move moses-cmd/src/* to moses-cmd/	2012-11-12 20:42:29 +00:00
TranslationAnalysis.cpp	speed up compiling by removing headers from StaticData.h	2013-10-03 11:05:53 +01:00
TranslationAnalysis.h	delete class TranslationSystem	2013-05-11 14:13:26 +01:00