From: Ondrej Zajicek (work) <santiago@crfreenet.org>
Date: Thu, 12 May 2016 19:47:50 +0000 (+0200)
Subject: Merge branch 'master' into int-new
X-Git-Tag: v2.0.0-pre0~37^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b66a9e2f3376b4cb07ef4cc318f70a9c794f407a;p=thirdparty%2Fbird.git

Merge branch 'master' into int-new
---

b66a9e2f3376b4cb07ef4cc318f70a9c794f407a
diff --cc lib/Makefile
index a9aae66f9,000000000..8e372bd31
mode 100644,000000..100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@@ -1,7 -1,0 +1,3 @@@
- src := bitops.c checksum.c ip.c lists.c md5.c net.c patmatch.c printf.c sha1.c sha256.c sha512.c slists.c xmalloc.c
- obj := $(src-o-files)
- $(all-client)
- 
 +src := bitops.c checksum.c event.c idm.c ip.c lists.c md5.c mempool.c net.c patmatch.c printf.c resource.c sha1.c sha256.c sha512.c slab.c slists.c tbf.c xmalloc.c
 +obj := $(src-o-files)
 +$(all-daemon)