Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/release'
Browse files Browse the repository at this point in the history
  • Loading branch information
aradi committed Sep 14, 2021
2 parents 5b43416 + 8c959ff commit ee1c126
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 6 deletions.
9 changes: 7 additions & 2 deletions CHANGELOG.rst
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,13 @@ Change Log
Notable project changes in various releases.


Unreleased
==========
1.1
===

Added
-----

* Method 'free' implemented to release the MPI-communicator


1.0
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ include(MpiFxUtils)

include(${CMAKE_CURRENT_SOURCE_DIR}/config.cmake)

project(MpiFx VERSION 1.0 LANGUAGES Fortran)
project(MpiFx VERSION 1.1 LANGUAGES Fortran)

setup_build_type()

Expand Down
2 changes: 1 addition & 1 deletion doc/doxygen/Doxyfile
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ PROJECT_NAME = "MpiFx"
# This could be handy for archiving the generated documentation or
# if some version control system is used.

PROJECT_NUMBER = "1.0"
PROJECT_NUMBER = "1.1"

# 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
4 changes: 2 additions & 2 deletions doc/sphinx/conf.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,10 +45,10 @@
# built documents.
#
# The short X.Y version.
version = '1.0'
version = '1.1'

# The full version, including alpha/beta/rc tags.
release = '1.0'
release = '1.1'

# The language for content autogenerated by Sphinx. Refer to documentation
# for a list of supported languages.
Expand Down

0 comments on commit ee1c126

Please sign in to comment.