summaryrefslogtreecommitdiffstats
path: root/src
Commit message (Expand)AuthorAgeFilesLines
* Resolve conflicts from previous merge.Vailin Choi2017-12-051-2/+2
* Merge branch changes from hdf5_1_10.Vailin Choi2017-12-0537-3934/+4147
|\
| * Merge branch 'develop' into hdf5_1_10M. Scot Breitenfeld2017-11-2837-3933/+4147
| |\
| | * Fixed misc Warnings flagged by VS2017.Dana Robinson2017-11-274-120/+118
| | * Made a dcpl layout struct in H5Z.c dynamic to quiet a stack size warning.Dana Robinson2017-11-211-12/+19
| | * Fixed an uninitialized filter callback struct in H5Dchunk.c andDana Robinson2017-11-215-114/+144
| | * Fixed Windows code in H5PLpath.cDana Robinson2017-11-211-1/+1
| | * Brings H5Z and H5PL packages in sync with VOL integration branch.Dana Robinson2017-11-177-127/+147
| | * HDFFV-10328 - fix typosAllen Byrne2017-11-171-5/+4
| | * HDFFV-10328 - remove allocation changesAllen Byrne2017-11-173-70/+6
| | * Fix typoAllen Byrne2017-11-161-1/+1
| | * HDFFV-10328 merge allocation changes from 1.8Allen Byrne2017-11-163-340/+422
| | * Correct linkage of filters and other libsAllen Byrne2017-11-161-2/+2
| | * Minor warning fixesDana Robinson2017-11-151-24/+22
| | * Merge pull request #778 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5o_schism_work...Dana Robinson2017-11-155-2667/+2738
| | |\
| | | * Moved code from H5O.c to H5Oint.cDana Robinson2017-11-143-2662/+2662
| | | * Added H5Oint.c file.Dana Robinson2017-11-144-5/+76
| | * | Correct link lines of librariesAllen Byrne2017-11-141-2/+2
| | |/
| | * Merge pull request #772 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:ar_warning_fix ...Dana Robinson2017-11-141-0/+1
| | |\
| | | * Fixed that annoying ar warning about -u being ignored.Dana Robinson2017-11-131-0/+1
| | * | Merge pull request #770 in HDFFV/hdf5 from ~NFORTNE2/hdf5_naf:develop to developNeil Fortner2017-11-131-7/+8
| | |\ \ | | | |/ | | |/|
| | | * Merge branch 'develop' of ssh://bitbucket.hdfgroup.org:7999/~nfortne2/hdf5_na...Neil Fortner2017-11-1026-2976/+2339
| | | |\
| | | * | Fix HDFFV-10274. When deleting all (or almost all) of the messages inNeil Fortner2017-11-101-7/+8
| | * | | Merge pull request #767 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:zero_allocation...Dana Robinson2017-11-111-7/+1
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Removed asserts from H5MM calls that conflict with stated behaviorDana Robinson2017-11-091-7/+1
| | * | | Cleaned up misc warnings in src and test.Dana Robinson2017-11-105-8/+7
| | * | | Merge pull request #762 in HDFFV/hdf5 from ~DEROBINS/hdf5_der:h5r_cleanup to ...Dana Robinson2017-11-0913-854/+950
| | |\ \ \ | | | |/ / | | |/| |
| | | * | Split internal H5R functionality into H5Rint.c.Dana Robinson2017-11-0813-854/+950
| | | |/
* | | | Fix for HDFFV-9947 H5SencodeVailin Choi2017-11-2830-268/+679
|/ / /
* | | Snapshot version 1.10 release 2 (snap3)hdftest2017-11-201-2/+2
* | | HDFFV-10328 fix typosAllen Byrne2017-11-171-5/+4
* | | HDFFV-10328 - remove plugin allocation changesAllen Byrne2017-11-172-337/+355
* | | HDFFV-10328, HDFFV-10329 Merge from developAllen Byrne2017-11-161-2/+2
* | | Merging in latest from upstream (HDFFV/hdf5:refs/heads/hdf5_1_10)Allen Byrne2017-11-161-7/+8
|\ \ \
| * | | Fix HDFFV-10274. When deleting all (or almost all) of the messages inNeil Fortner2017-11-151-7/+8
* | | | Fix linking of libsAllen Byrne2017-11-141-2/+2
|/ / /
* | | Merge pull request #12 in ~BYRN/hdf5_adb from develop to hdf5_1_10Allen Byrne2017-11-088-2114/+1382
|\ \ \ | |/ /
| * | Remove tabsAllen Byrne2017-11-082-216/+144
| * | Remove tabsAllen Byrne2017-11-083-1297/+809
| * | Remove tabsAllen Byrne2017-11-081-17/+17
| * | Remove tabsAllen Byrne2017-11-081-68/+68
| * | Remove tabsAllen Byrne2017-11-081-516/+344
| |/
| * Correct usage of MPI varsAllen Byrne2017-11-011-6/+4
| * Convert to use MPI:: for linkAllen Byrne2017-11-011-2/+4
| * Correct command usageAllen Byrne2017-11-011-5/+5
| * Change MPI target properties for libraryAllen Byrne2017-11-011-2/+2
| * Add a missing declaration for testingRichard Warren2017-10-271-0/+1
* | HDFFV-10321 merge from developAllen Byrne2017-11-021-7/+7
* | manual fix from merge with developM. Scot Breitenfeld2017-10-261-0/+1
* | fixed merge with develop issuesM. Scot Breitenfeld2017-10-261-2/+2