Scot Breitenfeld
|
fc44136ee7
|
[svn-r26308] Merged r26214, 26217, 26233, 26241 from the trunk.
|
2015-02-25 17:26:08 -05:00 |
|
Scot Breitenfeld
|
442f985464
|
[svn-r25433] Brought changes from the trunk into the branch.
For the top level, brings in changes for configure.ac, configure and the MANIFEST:
svn merge -c25286 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
svn merge -c25287 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
svn merge -c25290 https://svn.hdfgroup.uiuc.edu/hdf5/trunk .
For the fortran level:
384 17:00 svn merge -r25235:25272 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
389 17:01 svn merge -r25284:25432 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
For the fortran merges, I skipped changes relating to hyperslab selection since the C source has not been merged from the trunk yet. These changes should be in place in the fortran source when the C source is merged to the 1.8 branch.
|
2014-07-18 17:17:58 -05:00 |
|
Scot Breitenfeld
|
19c485a128
|
[svn-r25027] Merged changes from the trunk to the branch,
svn merge -r24929:25009 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
tested: jam (gnu)
|
2014-04-11 22:26:21 -05:00 |
|
Scot Breitenfeld
|
dcde3e4cdf
|
[svn-r24651] Merged changes in the fortran directory from the trunk into the branch,
svn merge -r23351:24650 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran .
Tested: jam (gcc, intel), koala (gcc)
|
2014-01-27 17:13:23 -05:00 |
|
Scot Breitenfeld
|
c129390dfe
|
[svn-r23352] merged -r22826:23050 and -r23060:23351 from trunk into branch.
Tested: jam (gnu, intel)
|
2013-03-15 00:08:29 -05:00 |
|
Scot Breitenfeld
|
c783decba5
|
[svn-r22840] Merged changes from the trunk into the branch,
svn merge -r22479:22826 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
tested: jam (gnu, intel, pgi)
koala (gnu, pgi)
|
2012-09-28 10:31:22 -05:00 |
|
Scot Breitenfeld
|
c4a83163d3
|
[svn-r21731] Brought revisions 21719 and 21720 from the trunk, fixes test failures on Mac
and race condition with make check -j#.
Tested: jam (gnu)
|
2011-11-07 23:13:06 -05:00 |
|
Scot Breitenfeld
|
4af3cd2b7a
|
[svn-r21421] Merged the Fortran 2003 changes from the trunk into the 1.8 branch, used:
svn merge -r 20506:21414 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran
Tested: jam (gnu, intel, pgi compilers)
Also merged effected non-Fortran files:
svn merge -r21247:r21248 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/src/libhdf5.settings.in
|
2011-09-27 00:02:38 -05:00 |
|