diff options
author | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
---|---|---|
committer | Patrick Simianer <p@simianer.de> | 2013-12-04 20:13:07 +0100 |
commit | 02647059daa297e7b2b3ca3a2c03d848ae3ad9f2 (patch) | |
tree | a5d2b5d66a8cff38a9422378c66861a3fb493e80 /.gitignore | |
parent | 7b2cd4e93114baaa329c483a98d6f7999aad1ba0 (diff) | |
parent | 7d391d8eb88d27c5637042fefe2d27e7b12f5587 (diff) |
fix merge conflict
Diffstat (limited to '.gitignore')
-rw-r--r-- | .gitignore | 4 |
1 files changed, 4 insertions, 0 deletions
@@ -72,6 +72,7 @@ extools/score_grammar extools/sg_lexer.cc extractor/*_test extractor/compile +extractor/extract extractor/run_extractor gi/clda/src/clda gi/markov_al/ml @@ -104,6 +105,7 @@ jam-files/bjam jam-files/engine/bin.* jam-files/engine/bootstrap/ klm/lm/bin/ +klm/lm/builder/builder klm/lm/builder/lmplz klm/lm/build_binary klm/lm/ngram_query @@ -187,8 +189,10 @@ utils/mfcr_test utils/phmt utils/reconstruct_weights utils/small_vector_test +utils/sv_test utils/ts utils/weights_test +training/crf/mpi_adagrad_optimize training/crf/mpi_batch_optimize training/crf/mpi_baum_welch training/crf/mpi_compute_cllh |