From: Ondrej Zajicek <santiago@crfreenet.org>
Date: Wed, 22 May 2013 22:24:28 +0000 (+0200)
Subject: Merge commit 'a2017200c71293d0a28a39d1f250ba38d57f6289' into integrated
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ab5dbd5bfc4e97ae9e72e36d3279131a5111ea51;p=thirdparty%2Fbird.git

Merge commit 'a2017200c71293d0a28a39d1f250ba38d57f6289' into integrated
---

ab5dbd5bfc4e97ae9e72e36d3279131a5111ea51
diff --cc sysdep/config.h
index 6e446547e,3b83d5585..18423cdde
--- 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.9"
+ #define BIRD_VERSION "1.3.10"
  
 +// XXXX temporary define
 +#define IPV1 1
 +
  /* Include parameters determined by configure script */
  #include "sysdep/autoconf.h"