diff options
| author | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
|---|---|---|
| committer | Mohamad Chaarawi <chaarawi@hdfgroup.org> | 2012-04-10 20:19:35 (GMT) |
| commit | 45f6d4c1eed29c45476970a9703304378a5a1073 (patch) | |
| tree | 667240a5ea57e8a072bc8ffb59ecb7281867164c /vms | |
| parent | ad4b4b2b90c340bb408ddf32dd5cae780547bad2 (diff) | |
| parent | 09fa6e9c54380362f6f283ad60daef679ec91b25 (diff) | |
| download | hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.zip hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.gz hdf5-45f6d4c1eed29c45476970a9703304378a5a1073.tar.bz2 | |
[svn-r22274] merge from trunk, resolve conflicts
Diffstat (limited to 'vms')
| -rw-r--r--[-rwxr-xr-x] | vms/COPYING | 0 | ||||
| -rw-r--r-- | vms/src/h5pubconf.h | 6 |
2 files changed, 3 insertions, 3 deletions
diff --git a/vms/COPYING b/vms/COPYING index 6903daf..6903daf 100755..100644 --- a/vms/COPYING +++ b/vms/COPYING diff --git a/vms/src/h5pubconf.h b/vms/src/h5pubconf.h index 2df95ef..b4f9d19 100644 --- a/vms/src/h5pubconf.h +++ b/vms/src/h5pubconf.h @@ -505,7 +505,7 @@ #define H5_PACKAGE_NAME "HDF5" /* Define to the full name and version of this package. */ -#define H5_PACKAGE_STRING "HDF5 1.9.112" +#define H5_PACKAGE_STRING "HDF5 1.9.114" /* Define to the one symbol short name of this package. */ #define H5_PACKAGE_TARNAME "hdf5" @@ -514,7 +514,7 @@ #define H5_PACKAGE_URL "" /* Define to the version of this package. */ -#define H5_PACKAGE_VERSION "1.9.112" +#define H5_PACKAGE_VERSION "1.9.114" /* Width for printf() for type `long long' or `__int64', use `ll' */ #define H5_PRINTF_LL_WIDTH "ll" @@ -677,7 +677,7 @@ /* #undef H5_USING_MEMCHECKER */ /* Version number of package */ -#define H5_VERSION "1.9.112" +#define H5_VERSION "1.9.114" /* Define if vsnprintf() returns the correct value for formatted strings that don't fit into size allowed */ |