diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2011-10-28 18:54:23 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2011-10-28 18:54:23 +0400 |
| commit | 90820ad0c5e0c54641518f64720179e5426cfae1 (patch) | |
| tree | 0314ac341ea724c97f2e05514d43e11c8021cc7a /.gitignore | |
| parent | bd056a52783e78593c6beecc9f481251a85a1270 (diff) | |
| parent | 42924144fd0c247a57d669db7862be898f675416 (diff) | |
Merge branch 'master' into miramerge.
Also fix mert-moses.pl to use correct flag for specifying
weights of non-core features.
Conflicts:
.gitignore
configure.in
ltmain.sh
moses/src/LM/Factory.cpp
moses/src/LMList.cpp
moses/src/LMList.h
moses/src/LanguageModel.cpp
moses/src/LanguageModel.h
moses/src/LanguageModelKen.h
moses/src/Makefile.am
moses/src/Manager.cpp
moses/src/PhraseDictionaryMemory.cpp
moses/src/PhraseDictionaryTree.cpp
moses/src/StaticData.cpp
moses/src/TargetPhrase.h
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/.gitignore b/.gitignore index c21b27bd4..bd972b973 100644 --- a/.gitignore +++ b/.gitignore @@ -67,7 +67,6 @@ CreateOnDisk/src/CreateOnDiskPt .libs kenlm/query libtool -m4/libtool.m4 m4/lt* misc/queryPhraseTable moses-chart-cmd/src/moses_chart @@ -75,4 +74,4 @@ moses-cmd/src/checkplf moses-cmd/src/lmbrgrid regression-testing/moses-reg-test-data-* unittest/moses_test - +ltmain.sh |