summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLarry Knox <lrknox@hdfgroup.org>2016-12-16 22:31:21 (GMT)
committerLarry Knox <lrknox@hdfgroup.org>2016-12-16 22:31:21 (GMT)
commit700c6ae9851752d8ccf6fc18cdd5b44dcf9603a5 (patch)
treebe7fe7b1cdfa79a4349b61aa738fc61d80d39abe
parent15b9ba46c02db1c8cd343c4e277cac8e61002911 (diff)
parente0b353b6f5a9c80ffe7a1f82cee6a15c13d25692 (diff)
downloadhdf5-700c6ae9851752d8ccf6fc18cdd5b44dcf9603a5.zip
hdf5-700c6ae9851752d8ccf6fc18cdd5b44dcf9603a5.tar.gz
hdf5-700c6ae9851752d8ccf6fc18cdd5b44dcf9603a5.tar.bz2
Merge pull request #205 in HDFFV/hdf5 from ~HDFTEST/hdf5_hft:develop to develop
* commit 'e0b353b6f5a9c80ffe7a1f82cee6a15c13d25692': Snapshot version 1.9 release 235
-rw-r--r--MANIFEST9
-rw-r--r--README.txt2
-rw-r--r--c++/src/cpp_doc_config2
-rw-r--r--configure.ac2
-rw-r--r--release_docs/RELEASE.txt2
-rw-r--r--src/H5public.h4
6 files changed, 15 insertions, 6 deletions
diff --git a/MANIFEST b/MANIFEST
index 02d3046..ae8e0a3 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -3105,6 +3105,15 @@
./hl/tools/gif2h5/Makefile.in
./hl/tools/h5watch/Makefile.in
./hl/tools/Makefile.in
+./java/examples/intro/Makefile.in
+./java/examples/datasets/Makefile.in
+./java/examples/datatypes/Makefile.in
+./java/examples/Makefile.in
+./java/examples/groups/Makefile.in
+./java/Makefile.in
+./java/test/Makefile.in
+./java/src/Makefile.in
+./java/src/jni/Makefile.in
./m4/libtool.m4
./m4/lt~obsolete.m4
./m4/ltoptions.m4
diff --git a/README.txt b/README.txt
index 151e92c..e51a486 100644
--- a/README.txt
+++ b/README.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.235 currently under development
+HDF5 version 1.9.236 currently under development
Please refer to the release_docs/INSTALL file for installation instructions.
------------------------------------------------------------------------------
diff --git a/c++/src/cpp_doc_config b/c++/src/cpp_doc_config
index c024c45..5986eaa 100644
--- a/c++/src/cpp_doc_config
+++ b/c++/src/cpp_doc_config
@@ -38,7 +38,7 @@ PROJECT_NAME = "HDF5 C++ API"
# could be handy for archiving the generated documentation or if some version
# control system is used.
-PROJECT_NUMBER = "1.9.235 currently under development"
+PROJECT_NUMBER = "1.9.236 currently under development"
# Using the PROJECT_BRIEF tag one can provide an optional one line description
# for a project that appears at the top of each page and should give viewer a
diff --git a/configure.ac b/configure.ac
index f8077b7..f4c5855 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,7 +26,7 @@ AC_PREREQ([2.69])
## NOTE: Do not forget to change the version number here when we do a
## release!!!
##
-AC_INIT([HDF5], [1.9.235], [help@hdfgroup.org])
+AC_INIT([HDF5], [1.9.236], [help@hdfgroup.org])
AC_CONFIG_SRCDIR([src/H5.c])
AC_CONFIG_HEADERS([src/H5config.h])
diff --git a/release_docs/RELEASE.txt b/release_docs/RELEASE.txt
index 179a5c7..cc77fcb 100644
--- a/release_docs/RELEASE.txt
+++ b/release_docs/RELEASE.txt
@@ -1,4 +1,4 @@
-HDF5 version 1.9.235 currently under development
+HDF5 version 1.9.236 currently under development
================================================================================
diff --git a/src/H5public.h b/src/H5public.h
index 84c98fa..f0eb63a 100644
--- a/src/H5public.h
+++ b/src/H5public.h
@@ -94,10 +94,10 @@ extern "C" {
/* Version numbers */
#define H5_VERS_MAJOR 1 /* For major interface/format changes */
#define H5_VERS_MINOR 9 /* For minor interface/format changes */
-#define H5_VERS_RELEASE 235 /* For tweaks, bug-fixes, or development */
+#define H5_VERS_RELEASE 236 /* For tweaks, bug-fixes, or development */
#define H5_VERS_SUBRELEASE "" /* For pre-releases like snap0 */
/* Empty string for real releases. */
-#define H5_VERS_INFO "HDF5 library version: 1.9.235" /* Full version string */
+#define H5_VERS_INFO "HDF5 library version: 1.9.236" /* Full version string */
#define H5check() H5check_version(H5_VERS_MAJOR,H5_VERS_MINOR, \
H5_VERS_RELEASE)