Skip to content

Commit

Permalink
Tagging trunk with unreleased 1.4-dev
Browse files Browse the repository at this point in the history
  • Loading branch information
bingmann committed Oct 29, 2014
1 parent e7d36ed commit 009fb11
Show file tree
Hide file tree
Showing 3 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions 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"),
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Expand Up @@ -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}")

Expand Down
2 changes: 1 addition & 1 deletion Doxyfile
Expand Up @@ -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
Expand Down

0 comments on commit 009fb11

Please sign in to comment.