diff options
| author | Barry Haddow <barry.haddow@gmail.com> | 2011-12-09 03:17:30 +0400 |
|---|---|---|
| committer | Barry Haddow <barry.haddow@gmail.com> | 2011-12-09 03:17:30 +0400 |
| commit | 072848a4dfe3fac6c1398684bea46020611f9e3a (patch) | |
| tree | 4b6a97f423ab929191802787c0983844afd9fd6d /.gitignore | |
| parent | 15091ab70ce249cb1c7b714d13fd5f477ddab3bf (diff) | |
| parent | cb5213ac438abb24a75dfdff5f7b8b7558518267 (diff) | |
Merge branch 'master' into bjam. Doesn't compile.
Conflicts:
.gitignore
Makefile.am
config.h.in
configure.in
m4/boost.m4
moses/src/LM/Factory.cpp
moses/src/LM/ParallelBackoff.h
moses/src/LM/RandLM.h
moses/src/Makefile.am
moses/src/PDTAimp.h
moses/src/Phrase.h
moses/src/PhraseDictionaryTree.cpp
moses/src/ScoreComponentCollection.h
moses/src/ScoreIndexManager.cpp
moses/src/StaticData.cpp
moses/src/TargetPhrase.cpp
moses/src/TranslationOptionCollection.cpp
moses/src/TranslationSystem.cpp
scripts/Makefile
scripts/released-files
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 77 |
1 files changed, 16 insertions, 61 deletions
diff --git a/.gitignore b/.gitignore index a4b810efa..facb831bb 100644 --- a/.gitignore +++ b/.gitignore @@ -1,54 +1,30 @@ -*.[oa] -*.lo -.deps -*.orig -*.la -*.Po +*.so +*.a +*.swp *~ -CreateOnDisk/src/CreateOnDiskPt -Makefile -Makefile.in -aclocal.m4 -autom4te.cache/ -config.h -config.log -config.status -configure -lm/.deps/ -lm/.libs/ -util/.deps/ -util/.libs/ +dist* +jam-files/bjam +jam-files/engine/bootstrap +jam-files/engine/bin.* lm/build_binary lm/query -libtool -mert/.deps/ -kenlm/build_binary -mert/Makefile -mert/Makefile.in mert/evaluator mert/extractor mert/mert -misc/.deps/ -mert/.libs/ -misc/Makefile -misc/Makefile.in +mert/megam_i686.opt +mert/pro misc/processLexicalTable misc/processPhraseTable misc/queryLexicalTable mira/mira misc/queryPhraseTable -moses-chart/src/.deps/ moses-chart-cmd/src/moses_chart -moses-cmd/src/.deps/ -moses-cmd/src/Makefile -moses-cmd/src/Makefile.in moses-cmd/src/checkplf moses-cmd/src/lmbrgrid moses-cmd/src/moses -moses/src/.deps/ -moses/src/.libs/ -moses/src/Makefile -moses/src/Makefile.in +regression-testing/moses-reg-test-data-* +regression-testing/tests/mert.extractor-bin/FEATSTAT* +regression-testing/tests/mert.extractor-bin/SCORESTAT* scripts/ems/biconcor/biconcor scripts/release-exclude scripts/training/cmert-0.5/mert @@ -62,34 +38,13 @@ scripts/training/phrase-extract/consolidate scripts/training/phrase-extract/consolidate-direct scripts/training/phrase-extract/consolidate-reverse scripts/training/phrase-extract/extract +scripts/training/phrase-extract/extract-ghkm/tools/extract-ghkm scripts/training/phrase-extract/extract-lex scripts/training/phrase-extract/extract-rules scripts/training/phrase-extract/relax-parse scripts/training/phrase-extract/score scripts/training/phrase-extract/statistics scripts/training/symal/symal -scripts/release-exclude -scripts/training/eppex/counter -scripts/training/eppex/eppex -scripts/training/lexical-reordering/score -scripts/training/memscore/memscore -scripts/training/phrase-extract/consolidate -scripts/training/phrase-extract/consolidate-direct -scripts/training/phrase-extract/consolidate-reverse -scripts/training/phrase-extract/extract-lex -scripts/training/phrase-extract/extract-rules -scripts/training/phrase-extract/relax-parse -scripts/training/phrase-extract/statistics -stamp-h1 -CreateOnDisk/src/CreateOnDiskPt -.libs -kenlm/query -libtool -m4/lt* -misc/queryPhraseTable -moses-chart-cmd/src/moses_chart -moses-cmd/src/checkplf -moses-cmd/src/lmbrgrid -regression-testing/moses-reg-test-data-* -unittest/moses_test -ltmain.sh +scripts/training/train-model.perl +dist +bin |