Skip to content

Commit

Permalink
Merge pull request #139 from ComputationalRadiationPhysics/dev
Browse files Browse the repository at this point in the history
Release 1.2.2: Version Number
  • Loading branch information
f-schmitt-zih committed Jun 23, 2014
2 parents 43c0b8a + 5e7f014 commit 561c0e5
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 4 deletions.
8 changes: 8 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,6 +1,14 @@
Change Log for libSplash
================================================================

Release 1.2.2
-------------
**Date:** 2014-06-21

That release was necessary since we forgot to bump the version
number in <splash/version.hpp> with the last release.


Release 1.2.1
-------------
**Date:** 2014-06-20
Expand Down
9 changes: 5 additions & 4 deletions src/include/splash/version.hpp
Original file line number Diff line number Diff line change
Expand Up @@ -2,18 +2,19 @@
* Copyright 2013-2014 Felix Schmitt, Axel Huebl
*
* This file is part of libSplash.
*
*
* libSplash is free software: you can redistribute it and/or modify
* it under the terms of of either the GNU General Public License or
* the GNU Lesser General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
* (at your option) any later version.
*
* libSplash is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License and the GNU Lesser General Public License
* for more details.
*
*
* You should have received a copy of the GNU General Public License
* and the GNU Lesser General Public License along with libSplash.
* If not, see <http://www.gnu.org/licenses/>.
Expand All @@ -25,7 +26,7 @@
/** the splash version reflects the changes in API */
#define SPLASH_VERSION_MAJOR 1
#define SPLASH_VERSION_MINOR 2
#define SPLASH_VERSION_PATCH 0
#define SPLASH_VERSION_PATCH 2

/** we can always handle files from the same major release
* changes in the minor number have to be backwards compatible
Expand Down

0 comments on commit 561c0e5

Please sign in to comment.