diff options
| author | David Lamparter <equinox@opensourcerouting.org> | 2017-04-04 18:34:08 +0200 |
|---|---|---|
| committer | David Lamparter <equinox@opensourcerouting.org> | 2017-04-04 19:01:47 +0200 |
| commit | 3e7c8d040ce092d42b485cb45461af575a99e39e (patch) | |
| tree | 20ddb4bf5d39b348041af75b7102623e4f0d29c2 /Makefile.am | |
| parent | e5fd248c254463830f96eb35d8ea60385ab226c0 (diff) | |
| parent | 3e71b5d907e9a58049e188cd88ad86614c5ad4f6 (diff) | |
Merge branch 'stable/2.0'
Fixed minor conflicts from "defaults" change on stable.
Signed-off-by: David Lamparter <equinox@opensourcerouting.org>
Diffstat (limited to 'Makefile.am')
| -rw-r--r-- | Makefile.am | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index aa978b7d25..89e7ea890e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -17,3 +17,5 @@ EXTRA_DIST = aclocal.m4 SERVICES REPORTING-BUGS \ tools/zebra.el tools/multiple-bgpd.sh ACLOCAL_AMFLAGS = -I m4 + +noinst_HEADERS = defaults.h |