Commit Graph

5 Commits

Author SHA1 Message Date
Ulrich Germann
050b089ea0 Merge branch 'master' of github.com:moses-smt/mosesdecoder
Conflicts:
	moses/FF/ControlRecombination.cpp
	moses/TranslationModel/SkeletonPT.cpp
2013-09-25 22:33:27 +01:00
Ulrich Germann
daaf71c76e Changed type of m_batch_size to uint32_t to avoid compiler signed/unsigned comparison warnings. 2013-09-25 22:08:50 +01:00
Hieu Hoang
deafd5922d skeleton PT 2013-09-25 16:57:01 +01:00
Hieu Hoang
6249432407 beautify 2013-05-29 18:16:15 +01:00
Hieu Hoang
5e3ef23cef move moses/src/* to moses/ 2012-11-12 19:56:18 +00:00