mosesdecoder/scripts/ems
phikoehn ff79f9f054 fix conflict
Merge branch 'master' of git://github.com/moses-smt/mosesdecoder

Conflicts:
	scripts/ems/experiment.perl
2012-07-03 00:05:13 +01:00
..
example update examples 2012-05-31 16:55:10 +01:00
support lock m_vocab variable access in Encode() and Lookup(). Other functions are still not threadsafe 2012-06-26 13:33:34 -04:00
web Added support for optional external METEOR script. Workflow changes in experiment.meta and and corresponding sample given in example/config.basic. Results processing for report-experiment-scores now supports METEOR output. Lifted web interface restriction on the types of metrics that can be listed 2012-01-12 18:37:02 +01:00
experiment.machines minor fixes 2012-05-26 00:09:50 +01:00
experiment.meta change output of build-suffix-array step to phrase-table. 2012-06-06 18:47:27 +01:00
experiment.perl fix conflict 2012-07-03 00:05:13 +01:00
fix-info.perl bug fix 2012-04-12 22:07:26 +01:00