From d415dfafd97ac855656f986bbffa4c42a957bd90 Mon Sep 17 00:00:00 2001 From: Franziska Schloesser Date: Fri, 24 Jun 2022 15:55:26 +0200 Subject: [PATCH] increase version to 6020 --- CHANGELOG | 7 ++++++- CMakeLists.txt | 2 +- Makefile | 2 +- doc/xternal.cpp | 2 +- scripts/makedist.sh | 2 +- src/soplex/spxdefines.h | 2 +- 6 files changed, 11 insertions(+), 6 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index e07fb5d5..957cfd35 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,4 +1,9 @@ -upcoming Release 6.0.1 +upcoming Release 6.0.2 +============================= + +fixed bugs: + +June 2022 - Release 6.0.1 ============================= fixed bugs: diff --git a/CMakeLists.txt b/CMakeLists.txt index f357b988..543b89a5 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -16,7 +16,7 @@ endif() set(SOPLEX_VERSION_MAJOR 6) set(SOPLEX_VERSION_MINOR 0) -set(SOPLEX_VERSION_PATCH 1) +set(SOPLEX_VERSION_PATCH 2) set(SOPLEX_VERSION_SUB 0) set(SOPLEX_VERSION_API 11) diff --git a/Makefile b/Makefile index 47448500..76dd76e1 100644 --- a/Makefile +++ b/Makefile @@ -42,7 +42,7 @@ include make/make.detecthost # default settings #----------------------------------------------------------------------------- -VERSION := 6.0.1 +VERSION := 6.0.2 SPXGITHASH = VERBOSE = false diff --git a/doc/xternal.cpp b/doc/xternal.cpp index d82270f4..a8b40e59 100644 --- a/doc/xternal.cpp +++ b/doc/xternal.cpp @@ -93,7 +93,7 @@ * SoPlex web page for a comprehensive list * of all contributors. * - * @version 6.0.1 + * @version 6.0.2.0 */ diff --git a/scripts/makedist.sh b/scripts/makedist.sh index bdc64c26..2b8af42f 100755 --- a/scripts/makedist.sh +++ b/scripts/makedist.sh @@ -3,7 +3,7 @@ # create tarball for release # usage: ./scripts/makedist.sh -VERSION="6.0.1" +VERSION="6.0.2.0" NAME="soplex-$VERSION" rm -f $NAME.tgz rm -f $NAME.tar diff --git a/src/soplex/spxdefines.h b/src/soplex/spxdefines.h index 712c67dc..b7f0c361 100644 --- a/src/soplex/spxdefines.h +++ b/src/soplex/spxdefines.h @@ -80,7 +80,7 @@ namespace soplex // Overloaded EQ function bool EQ(int a, int b); -#define SOPLEX_VERSION 601 +#define SOPLEX_VERSION 602 #define SOPLEX_SUBVERSION 0 #define SOPLEX_APIVERSION 13 #define SOPLEX_COPYRIGHT "Copyright (c) 1996-2022 Konrad-Zuse-Zentrum fuer Informationstechnik Berlin (ZIB)"