diff options
| author | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-12-11 04:59:26 +0300 |
|---|---|---|
| committer | Ulrich Germann <Ulrich.Germann@gmail.com> | 2015-12-11 04:59:26 +0300 |
| commit | 40ed3df9cb513681569a2fcde32a5215c38253f3 (patch) | |
| tree | 00edc16cc3858bed1bde3ddaa470cf58b80da742 /moses/ExportInterface.cpp | |
| parent | 29694af6e43c1cec7a6fd0b157eb44faca706129 (diff) | |
| parent | 739165c2b05dd3a423fedc6d14afcbf5ffe302e2 (diff) | |
Merge branch 'master' of https://github.com/moses-smt/mosesdecoder
Conflicts:
moses/ChartParser.cpp
moses/ChartParser.h
moses/ConfusionNet.h
moses/FF/CountNonTerms.cpp
moses/FF/CountNonTerms.h
moses/FF/SoftSourceSyntacticConstraintsFeature.cpp
moses/FF/SoftSourceSyntacticConstraintsFeature.h
moses/FF/SourceGHKMTreeInputMatchFeature.cpp
moses/FF/SourceGHKMTreeInputMatchFeature.h
moses/ForestInput.cpp
moses/InputType.h
moses/MockHypothesis.cpp
moses/Sentence.cpp
moses/Sentence.h
moses/StaticData.cpp
moses/StaticData.h
moses/Syntax/F2S/GlueRuleSynthesizer.h
moses/Syntax/T2S/GlueRuleSynthesizer.cpp
moses/Syntax/T2S/GlueRuleSynthesizer.h
moses/TreeInput.cpp
moses/XmlOption.cpp
moses/XmlOption.h
Diffstat (limited to 'moses/ExportInterface.cpp')
0 files changed, 0 insertions, 0 deletions