From 009fb116d61a0c64f415eb865e0fc130f8873a10 Mon Sep 17 00:00:00 2001 From: Timo Bingmann Date: Wed, 29 Oct 2014 10:55:01 +0100 Subject: [PATCH] Tagging trunk with unreleased 1.4-dev --- CHANGELOG | 2 ++ CMakeLists.txt | 2 +- Doxyfile | 2 +- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/CHANGELOG b/CHANGELOG index 28d387d4b..e0e452732 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -1,3 +1,5 @@ +Version 1.4-dev (unreleased) + Version 1.4.1 (29 October 2014) * support kernel based asynchronous I/O on Linux (new file type "linuxaio"), diff --git a/CMakeLists.txt b/CMakeLists.txt index f7301a437..8f5e60858 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -37,7 +37,7 @@ endif() # STXXL version string set(STXXL_VERSION_MAJOR "1") set(STXXL_VERSION_MINOR "4") -set(STXXL_VERSION_PATCH "1") +set(STXXL_VERSION_PATCH "99") set(STXXL_VERSION_STRING "${STXXL_VERSION_MAJOR}.${STXXL_VERSION_MINOR}.${STXXL_VERSION_PATCH}") set(STXXL_VERSION_PHASE "prerelease/${CMAKE_BUILD_TYPE}") diff --git a/Doxyfile b/Doxyfile index 6206722ba..0b313229b 100644 --- a/Doxyfile +++ b/Doxyfile @@ -32,7 +32,7 @@ PROJECT_NAME = STXXL # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 1.4.1 +PROJECT_NUMBER = 1.4-dev # Using the PROJECT_BRIEF tag one can provide an optional one line description # for a project that appears at the top of each page and should give viewer