Commit Graph

4 Commits

Author SHA1 Message Date
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
11861e6618 [svn-r22509] Merged changes from the trunk into the branch:
svn merge -r 22163:22479 https://svn.hdfgroup.uiuc.edu/hdf5/trunk/fortran

Fixed merged issue with fortran/test/tH5E_F03.f90 (missing part of the file) and
changed Makefile.am accordingly.
2012-07-02 20:12:37 -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