From 15ec033f6c0be02c858525089d936de6d9b50f35 Mon Sep 17 00:00:00 2001
From: Olof hagsand <olof@hagsand.se>
Date: Mon, 30 Apr 2018 19:06:37 +0200
Subject: [PATCH] 3.6.0

---
 CHANGELOG.md | 2 +-
 configure    | 2 +-
 configure.ac | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 65020e7b..942f236f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,6 +1,6 @@
 # Clixon Changelog
 
-## 3.6.0 (Upcoming)
+## 3.6.0 (30 April 2018)
 
 ### Major changes:
 * Experimental NACM RFC8341 Network Configuration Access Control Model, see [NACM](README_NACM.md).
diff --git a/configure b/configure
index 3e4fb4b6..da33abc1 100755
--- a/configure
+++ b/configure
@@ -2149,7 +2149,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu
 CLIXON_VERSION_MAJOR="3"
 CLIXON_VERSION_MINOR="6"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
 # Fix to specific version (eg 3.5) or head (3)
 CLIGEN_VERSION="3"
 if test "$prefix" = "NONE"; then
diff --git a/configure.ac b/configure.ac
index 2990f5d6..19fe9b44 100644
--- a/configure.ac
+++ b/configure.ac
@@ -45,7 +45,7 @@ AC_INIT(lib/clixon/clixon.h.in)
 CLIXON_VERSION_MAJOR="3"
 CLIXON_VERSION_MINOR="6"
 CLIXON_VERSION_PATCH="0"
-CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}.PRE\""
+CLIXON_VERSION="\"${CLIXON_VERSION_MAJOR}.${CLIXON_VERSION_MINOR}.${CLIXON_VERSION_PATCH}\""
 # Fix to specific version (eg 3.5) or head (3) 
 CLIGEN_VERSION="3" 
 if test "$prefix" = "NONE"; then