diff options
| author | Stephane Ross <stephaneross@cmu.edu> | 2012-07-23 15:00:05 +0400 |
|---|---|---|
| committer | Stephane Ross <stephaneross@cmu.edu> | 2012-07-23 15:00:05 +0400 |
| commit | 258a0174604c6c2801946dfee65eb80ad302bf8e (patch) | |
| tree | c51034ab070167b5c91b6a4e067d0fa2e3f70a52 /Makefile.am | |
| parent | 51e5084d7a52bde2788412b9fa166c3f74cb47be (diff) | |
| parent | b8766eae38f6c72b56766977a392eab55acfa3c1 (diff) | |
merge and resolve conflicts
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/Makefile.am b/Makefile.am index 9d1c71c5..648de3b7 100644 --- a/Makefile.am +++ b/Makefile.am @@ -7,17 +7,17 @@ noinst_HEADERS = vowpalwabbit/accumulate.h vowpalwabbit/oaa.h \ vowpalwabbit/parse_example.h vowpalwabbit/cache.h \ vowpalwabbit/parse_primitives.h vowpalwabbit/comp_io.h \ vowpalwabbit/parse_regressor.h vowpalwabbit/constant.h \ - vowpalwabbit/parser.h vowpalwabbit/csoaa.h \ + vowpalwabbit/parser.h vowpalwabbit/csoaa.h vowpalwabbit/beam.h \ vowpalwabbit/searn.h vowpalwabbit/ect.h vowpalwabbit/cb.h \ vowpalwabbit/searn_sequencetask.h vowpalwabbit/example.h \ - vowpalwabbit/sender.h vowpalwabbit/gd.h \ - vowpalwabbit/sequence.h vowpalwabbit/gd_mf.h \ - vowpalwabbit/simple_label.h vowpalwabbit/global_data.h \ - vowpalwabbit/sparse_dense.h vowpalwabbit/hash.h \ - vowpalwabbit/unique_sort.h vowpalwabbit/io.h \ - vowpalwabbit/v_array.h vowpalwabbit/lda_core.h \ - vowpalwabbit/v_hashmap.h vowpalwabbit/loss_functions.h \ - vowpalwabbit/network.h vowpalwabbit/wap.h vowpalwabbit/noop.h + vowpalwabbit/sender.h vowpalwabbit/gd.h vowpalwabbit/sequence.h \ + vowpalwabbit/gd_mf.h vowpalwabbit/simple_label.h \ + vowpalwabbit/global_data.h vowpalwabbit/sparse_dense.h \ + vowpalwabbit/hash.h vowpalwabbit/unique_sort.h \ + vowpalwabbit/io.h vowpalwabbit/v_array.h \ + vowpalwabbit/lda_core.h vowpalwabbit/v_hashmap.h \ + vowpalwabbit/loss_functions.h vowpalwabbit/network.h \ + vowpalwabbit/wap.h vowpalwabbit/noop.h ACLOCAL_AMFLAGS = -I acinclude.d |