Skip to content

Commit

Permalink
Merge pull request #1539 from cyclus/bump-v-1.5.5
Browse files Browse the repository at this point in the history
Bump cyclus/src/version.h
  • Loading branch information
a-co committed Jan 13, 2020
2 parents f2cd192 + fae5ea0 commit 1b60ab1
Show file tree
Hide file tree
Showing 3 changed files with 3 additions and 2 deletions.
2 changes: 1 addition & 1 deletion cyclus/__init__.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
from __future__ import print_function, unicode_literals

__version__ = '1.5.0'
__version__ = '1.5.5'

from cyclus.lib import py_import_call_init

Expand Down
1 change: 1 addition & 0 deletions news/nonews.rst
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:)
2 changes: 1 addition & 1 deletion src/version.h
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@

#define CYCLUS_VERSION_MAJOR 1
#define CYCLUS_VERSION_MINOR 5
#define CYCLUS_VERSION_MICRO 0
#define CYCLUS_VERSION_MICRO 5

namespace cyclus {
namespace version {
Expand Down

0 comments on commit 1b60ab1

Please sign in to comment.