Commit 8831f7ec authored by Keith Bennett's avatar Keith Bennett

Merge tag 'v2.5.15' into devel

Version v2.5.15

# gpg: Signature made Wed 23 Nov 14:06:11 2016 GMT
# gpg:                using RSA key DB4F7D61DB1CE84F
# gpg: Good signature from "Keith Bennett <dr.keith.bennett@gmail.com>" [ultimate]
# gpg:                 aka "Keith Bennett <k.bennett@warwick.ac.uk>" [ultimate]
parents b1b6c91c d58e661a
......@@ -30,7 +30,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.14"
#define VERSION "2.4.15"
#define DBG_FLUSH() do { \
if (h && h->dbg_buf) { \
......
......@@ -1583,7 +1583,7 @@ MOD_INIT(sdf)
if (!m)
return MOD_ERROR_VAL;
PyModule_AddStringConstant(m, "__version__", "2.4.14");
PyModule_AddStringConstant(m, "__version__", "2.4.15");
PyModule_AddStringConstant(m, "__commit_id__", SDF_COMMIT_ID);
PyModule_AddStringConstant(m, "__commit_date__", SDF_COMMIT_DATE);
s = sdf_get_library_commit_id();
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.14"
#define VERSION "2.4.15"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
#define ABS(a) (((a) < 0.0) ? -(a) : (a))
......
......@@ -35,7 +35,7 @@
#include <mpi.h>
#endif
#define VERSION "2.4.14"
#define VERSION "2.4.15"
#define MIN(a,b) (((a) < (b)) ? (a) : (b))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment