diff options
| author | Kai-Wei Chang <kchang10.uiuc@gmail.com> | 2014-10-02 10:50:37 +0400 |
|---|---|---|
| committer | Kai-Wei Chang <kchang10.uiuc@gmail.com> | 2014-10-02 10:50:37 +0400 |
| commit | 95e7c86e2a600b04b40608d2c3eb9e58b3c91d4f (patch) | |
| tree | 5cbb92186eb1957968d05bbc3a75475d26933750 /Makefile.am | |
| parent | c8c87f24c2b7ef032cd4760854d482b8878a8259 (diff) | |
| parent | 8ad22bd04ac25454017b4e08470925dfd324a376 (diff) | |
Merge remote-tracking branch 'upstream/master'
Conflicts:
vowpalwabbit/Makefile.am
vowpalwabbit/searn.cc
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am index 801a20cc..276fbc6b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,8 @@ nobase_include_HEADERS = vowpalwabbit/allreduce.h \ vowpalwabbit/parser.h \ vowpalwabbit/simple_label.h \ vowpalwabbit/v_array.h \ - vowpalwabbit/vw.h + vowpalwabbit/vw.h \ + vowpalwabbit/vwdll.h noinst_HEADERS = vowpalwabbit/accumulate.h \ vowpalwabbit/autolink.h \ |