From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Tue, 29 Apr 2014 14:32:08 +0000 (+0200)
Subject: Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=37c21534578da9375fe9c2a5e712ed1cf841800d;p=thirdparty%2Fbird.git

Merge commit '0bb4e37db317a1290bad24fe430cac6569a9bd8c' into integrated

Conflicts:

	sysdep/linux/netlink.c
---

37c21534578da9375fe9c2a5e712ed1cf841800d
diff --cc sysdep/config.h
index a75780273,eb5606acc..2b668d0c7
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@@ -7,11 -7,8 +7,11 @@@
  #define _BIRD_CONFIG_H_
  
  /* BIRD version */
- #define BIRD_VERSION "1.3.12"
+ #define BIRD_VERSION "1.4.0"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"