diff options
| author | Colin Cherry <colin.a.cherry@gmail.com> | 2012-05-30 20:39:53 +0400 |
|---|---|---|
| committer | Colin Cherry <colin.a.cherry@gmail.com> | 2012-05-30 20:39:53 +0400 |
| commit | 3c44d04baf6f4cdb938ac4e4e318b0591d3f553a (patch) | |
| tree | 7a14d19983b81e0a981c1bdeda4062a456fc83b5 /.gitignore | |
| parent | d4a2414bf039db67b21689f3cc8ef8447fac5ff9 (diff) | |
| parent | beb2256dbaf420ed525cc8354617ead0db315060 (diff) | |
Merge branch 'master' into miramerge
Conflicts:
Jamroot
mert/FeatureStats.cpp
moses-cmd/src/IOWrapper.h
scripts/training/mert-moses.pl
scripts/training/train-model.perl.missing_bin_dir
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/.gitignore b/.gitignore index 31442947f..b082fcfcb 100644 --- a/.gitignore +++ b/.gitignore @@ -17,6 +17,7 @@ mert/extractor mert/mert mert/megam_i686.opt mert/pro +mert/kbmira misc/processLexicalTable misc/processPhraseTable misc/queryLexicalTable |