Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #317 in SUNDIALS/sunrepo from release-5.1.0 to dev…
…elop Squashed commit of the following: commit c6d8d61 Merge: 14d32ce 91b0738 Author: David J. Gardner <[email protected]> Date: Tue Jan 7 13:22:00 2020 -0800 Merge branch 'develop' into release-5.1.0 Conflicts: doc/arkode/ARKode.tex commit 14d32ce Author: David J. Gardner <[email protected]> Date: Mon Jan 6 14:36:56 2020 -0800 remove isnan, non-standard extension not supported by pgi commit aa0ed8c Author: David J. Gardner <[email protected]> Date: Mon Jan 6 14:37:41 2020 -0800 fix pgi compile error commit f90a71e Author: Balos, Cody Joe <[email protected]> Date: Mon Jan 6 11:33:53 2020 -0800 post-merge fix commit a73e9fb Merge: ddf53ca 520a88c Author: Balos, Cody Joe <[email protected]> Date: Mon Jan 6 10:06:21 2020 -0800 Merge branch 'develop' of ssh://mybitbucket.llnl.gov:7999/sundials/sunrepo into release-5.1.0 commit ddf53ca Author: Balos, Cody Joe <[email protected]> Date: Fri Jan 3 09:13:30 2020 -0800 update version numbers with updateVersion.sh script commit 19ed28d Author: Balos, Cody Joe <[email protected]> Date: Fri Jan 3 09:12:01 2020 -0800 Revert "update version numbers with updateVersion script" This reverts commit d2b9402. commit 9052a8e Author: Balos, Cody Joe <[email protected]> Date: Fri Jan 3 09:09:47 2020 -0800 update version numbers for recent changes commit a41b3f4 Author: Balos, Cody Joe <[email protected]> Date: Thu Jan 2 17:19:04 2020 -0800 regex ARKode.tex commit d2b9402 Author: Balos, Cody Joe <[email protected]> Date: Thu Jan 2 17:12:50 2020 -0800 update version numbers with updateVersion script commit 680c739 Author: Balos, Cody Joe <[email protected]> Date: Thu Jan 2 17:11:24 2020 -0800 regen F2003 interfaces
- Loading branch information