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

Merge commit '2b3d52aa421ae1c31e30107beefd82fddbb42854' into integrated
---

b1c680a680e2b78b5e646aedae6c5229edf7c7ae
diff --cc sysdep/config.h
index 0b96c707a,914c10908..a75780273
--- 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.11"
+ #define BIRD_VERSION "1.3.12"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"