# HG changeset patch
# User Sebastien Decugis <sdecugis@freediameter.net>
# Date 1624273698 -28800
# Node ID 6219359a36a92742aa70e0f6d8fe8fef665a354e
# Parent  932fca1cbbe4ddeb079202d7d5d365b699db341f# Parent  699c3fb0c57bb3ac7b0318855d9df4a453809406
Merge latest changes from proposed branch

diff -r 699c3fb0c57b -r 6219359a36a9 .hgtags
--- a/.hgtags	Wed Jun 16 18:44:45 2021 +0200
+++ b/.hgtags	Mon Jun 21 19:08:18 2021 +0800
@@ -83,3 +83,7 @@
 7f5aa6bb36424173a037a8576283cd8eb53787c0 1.3.2
 1a9c73262a882ed4831c47ec6c3a1b18a2796c67 1.4.0
 566bb46cc73f952d14c2793ecc509ff2c3ddc1b7 1.5.0
+566bb46cc73f952d14c2793ecc509ff2c3ddc1b7 1.5.0
+0000000000000000000000000000000000000000 1.5.0
+0000000000000000000000000000000000000000 1.5.0
+7c777b0082ec4b392f0f208233383eacab1ae69f 1.5.0
diff -r 699c3fb0c57b -r 6219359a36a9 CMakeLists.txt
--- a/CMakeLists.txt	Wed Jun 16 18:44:45 2021 +0200
+++ b/CMakeLists.txt	Mon Jun 21 19:08:18 2021 +0800
@@ -10,7 +10,7 @@
 
 # Version of the source code
 SET(FD_PROJECT_VERSION_MAJOR 1)
-SET(FD_PROJECT_VERSION_MINOR 4)
+SET(FD_PROJECT_VERSION_MINOR 5)
 SET(FD_PROJECT_VERSION_REV 0)
 
 # Version of the API with the library
diff -r 699c3fb0c57b -r 6219359a36a9 contrib/debian/changelog
--- a/contrib/debian/changelog	Wed Jun 16 18:44:45 2021 +0200
+++ b/contrib/debian/changelog	Mon Jun 21 19:08:18 2021 +0800
@@ -1,5 +1,9 @@
 freediameter (UNRELEASED) UNRELEASED; urgency=low
 
+  *
+
+freediameter (1.5.0) RELEASED; urgency=low
+
   * freeDiameter:
     - Add -g to help
     - Change -d and -q to control syslog level, as per stdout logging.