Skip to content

Commit

Permalink
Merge branch 'release-0.1.4'
Browse files Browse the repository at this point in the history
  • Loading branch information
simomarsili committed Sep 8, 2016
2 parents 4785af2 + 82b01bb commit f632f56
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 5 deletions.
2 changes: 1 addition & 1 deletion VERSION
Original file line number Diff line number Diff line change
@@ -1 +1 @@
0.1.2
0.1.4
2 changes: 0 additions & 2 deletions exts/ndd.f90
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
! Copyright (C) 2016, Simone Marsili
! All rights reserved.
! License: BSD 3 clause
! Version: 0.0.1
! Author: Simone Marsili ([email protected])

module constants
use iso_fortran_env
Expand Down
2 changes: 1 addition & 1 deletion ndd.py
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

__copyright__ = "Copyright (C) 2016 Simone Marsili"
__license__ = "BSD 3 clause"
__version__ = "0.1.2"
__version__ = "0.1.4"
__author__ = "Simone Marsili ([email protected])"
__all__ = ['entropy','histogram']

Expand Down
2 changes: 1 addition & 1 deletion requirements.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
numpy==1.11.1
numpy>=1.11.1

0 comments on commit f632f56

Please sign in to comment.