diff options
author | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2013-09-26 01:33:27 +0400 |
---|---|---|
committer | Ulrich Germann <ugermann@inf.ed.ac.uk> | 2013-09-26 01:33:27 +0400 |
commit | 050b089ea06086a00e5696ad7305132300c42beb (patch) | |
tree | 036eb0aa26ea5df827adac98a2a206575911013c /moses/SearchNormal.cpp | |
parent | 4fffe80c0c2e62f00a4809c9d186648f9e04bfa1 (diff) | |
parent | 429a195c68cd172dc6fb0d67bd8908d5414b6d92 (diff) |
Merge branch 'master' of github.com:moses-smt/mosesdecoder
Conflicts:
moses/FF/ControlRecombination.cpp
moses/TranslationModel/SkeletonPT.cpp
Diffstat (limited to 'moses/SearchNormal.cpp')
-rw-r--r-- | moses/SearchNormal.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/moses/SearchNormal.cpp b/moses/SearchNormal.cpp index ab435e7c8..5f6fd3df3 100644 --- a/moses/SearchNormal.cpp +++ b/moses/SearchNormal.cpp @@ -1,6 +1,7 @@ #include "Manager.h" #include "Timer.h" #include "SearchNormal.h" +#include "SentenceStats.h" using namespace std; |