# HG changeset patch
# User Sebastien Decugis <sdecugis@freediameter.net>
# Date 1351962281 -3600
# Node ID 5d934ed583ed4b61821b6b92612bcf5c45d62436
# Parent  2b14ccdd0b92f0de6d4d7d5bcc7a6de59b62ceb5
Prepared for release 1.1.5

diff -r 2b14ccdd0b92 -r 5d934ed583ed CMakeLists.txt
--- a/CMakeLists.txt	Sat Nov 03 17:45:03 2012 +0100
+++ b/CMakeLists.txt	Sat Nov 03 18:04:41 2012 +0100
@@ -11,7 +11,7 @@
 # Version of the source code
 SET(FD_PROJECT_VERSION_MAJOR 1)
 SET(FD_PROJECT_VERSION_MINOR 1)
-SET(FD_PROJECT_VERSION_REV 4)
+SET(FD_PROJECT_VERSION_REV 5)
 
 # Version of the API with the library
 SET(FD_PROJECT_VERSION_API 4)
diff -r 2b14ccdd0b92 -r 5d934ed583ed contrib/debian/changelog
--- a/contrib/debian/changelog	Sat Nov 03 17:45:03 2012 +0100
+++ b/contrib/debian/changelog	Sat Nov 03 18:04:41 2012 +0100
@@ -1,3 +1,12 @@
+freediameter (1.1.5) UNRELEASED; urgency=low
+
+  * Added compatibility with MAC OS X
+  * Fix behavior of timeout whe nsending messages to allow re-send.
+  * Several cleanups and new contributions included.
+  * Added dependency on C++ compiler for CMakeLists.txt
+
+ -- Sebastien Decugis <sdecugis@freediameter.net>  Sat, 03 Nov 2012 17:58:11 +0100
+
 freediameter (1.1.4) UNRELEASED; urgency=low
 
   * Compatibility with GnuTLS 3.x versions / updated packaging files accordingly
@@ -5,7 +14,7 @@
   * Updated dict_dcca in extensions and contrib (thanks Konstantin)
   * Changed dumping of messages to avoid interleaved information
 
- -- Sebastien Decugis <sdecugis@nict.go.jp>  Fri, 24 Aug 2012 00:17:05 +0200
+ -- Sebastien Decugis <sdecugis@freediameter.net>  Fri, 24 Aug 2012 00:17:05 +0200
 
 freediameter (1.1.3) UNRELEASED; urgency=low