Merge branch 'master' into release

Conflicts: setup.py
kiyo-masui · Mar 11, 2015 · e6db038 · e6db038
2 parents 27a4bf4 + c0b65a4
commit e6db038
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/setup.py b/setup.py
@@ -14,7 +14,9 @@
 
 VERSION_MAJOR = 0
 VERSION_MINOR = 2
-VERSION_POINT = 0
+VERSION_POINT = 1
+
+# Only unset in the 'release' branch and in tags.
 VERSION_DEV = 0
 
 VERSION = "%d.%d.%d" % (VERSION_MAJOR, VERSION_MINOR, VERSION_POINT)

diff --git a/src/bshuf_h5filter.h b/src/bshuf_h5filter.h
@@ -42,7 +42,7 @@
 #define BSHUF_H5_COMPRESS_LZ4 2
 
 
-H5Z_class_t bshuf_H5Filter[1];
+extern H5Z_class_t bshuf_H5Filter[1];
 
 
 /* ---- bshuf_register_h5filter ----