Commit Graph

6 Commits

Author SHA1 Message Date
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
5b25a40fa4 [svn-r23330] Merged r23325 from the trunk into the branch.
Tested: jam (intel)
2013-03-06 09:24:44 -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
fdade1b4c4 [svn-r21693] Brought r21691,r21690 to the branch, which:
Removed not needed test in fortranlib_test_F03.f90 and 
made fortranlib_test_1_8.f90 standard compliant.

tested: jam (gnu compiler)
2011-10-31 09:43:09 -05:00
Scot Breitenfeld
76e215174a [svn-r21568] Description:
Merged robodoc headers from trunk in the 1.8 branch, remove functions that should have not been merged into the 1.8 branch, removed the robodoc docomentation.

Tested: jam (gnu, intel, pgi)
2011-10-14 13:39:47 -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