From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Fri, 2 May 2014 16:28:33 +0000 (+0200)
Subject: Merge commit '4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cd50872c3b7ac467bb57d1c36e645cf27ae34a32;p=thirdparty%2Fbird.git

Merge commit '4dd24f05f384ac14546d4bebbfcb0ecf9a976ec6' into integrated
---

cd50872c3b7ac467bb57d1c36e645cf27ae34a32
diff --cc sysdep/config.h
index a32f6cfa9,e2ea76421..2b3d70c64
--- a/sysdep/config.h
+++ b/sysdep/config.h
@@@ -7,11 -7,8 +7,11 @@@
  #define _BIRD_CONFIG_H_
  
  /* BIRD version */
- #define BIRD_VERSION "1.4.2"
+ #define BIRD_VERSION "1.4.3"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"