changeset 1363:1bc02b9ecbd6

merge
author Thomas Klausner <tk@giga.or.at>
date Wed, 05 Jun 2019 12:45:36 +0200
parents 56f9e13f0ef0 (current diff) bb0efd234a30 (diff)
children a37692441c4d
files
diffstat 3 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Jun 05 12:45:12 2019 +0200
+++ b/.hgtags	Wed Jun 05 12:45:36 2019 +0200
@@ -79,3 +79,5 @@
 0000000000000000000000000000000000000000 1.2.1
 2cb8d71a405df19cf385e49e237f649589513e8d 1.2.1
 73b9f2aefb75f066d891a03a9145cc7addb2f2d3 1.3.0
+08a82e81951356c913285e9d54989e52549e8d63 1.3.1
+7f5aa6bb36424173a037a8576283cd8eb53787c0 1.3.2
--- a/CMakeLists.txt	Wed Jun 05 12:45:12 2019 +0200
+++ b/CMakeLists.txt	Wed Jun 05 12:45:36 2019 +0200
@@ -10,8 +10,8 @@
 
 # Version of the source code
 SET(FD_PROJECT_VERSION_MAJOR 1)
-SET(FD_PROJECT_VERSION_MINOR 2)
-SET(FD_PROJECT_VERSION_REV 1)
+SET(FD_PROJECT_VERSION_MINOR 3)
+SET(FD_PROJECT_VERSION_REV 2)
 
 # Version of the API with the library
 SET(FD_PROJECT_VERSION_API 6)
--- a/INSTALL.Ubuntu	Wed Jun 05 12:45:12 2019 +0200
+++ b/INSTALL.Ubuntu	Wed Jun 05 12:45:36 2019 +0200
@@ -46,6 +46,8 @@
 # Install the dependencies for building the source:
 sudo apt-get -y install mercurial cmake make gcc g++ bison flex libsctp-dev libgnutls-dev libgcrypt-dev libidn11-dev ssl-cert debhelper fakeroot \
    libpq-dev libmysqlclient-dev libxml2-dev swig python-dev
+   
+# On latest Ubuntu you will need libgnutls28-dev instead of libgnutls-dev
 
 # Retrieve the latest version of the source package
 cd 
"Welcome to our mercurial repository"