29 Commits

Author SHA1 Message Date
Darth Vader
0209fdf9c7 Merge commit 'b537589773f4819fe97ff8e5322bcd38c54b63f7' 2024-10-08 20:04:33 +00:00
Charlton, Scott R
279b84357d [iphreeqc] Fixed for R 2024-06-10 18:55:01 -06:00
Scott R Charlton
64e51c1d13 Try this to fix warning on Darwin 2024-03-04 19:11:28 -07:00
Scott R Charlton
79518deebc fixed ‘nullptr’ was not declared in this scope on ubuntu-16.04 2024-03-04 18:42:52 -07:00
Darth Vader
6ce9ad665a Merge commit '589ec40c7ce71d50ea98f7ff283f58ed5283cb29' 2023-11-18 01:30:46 +00:00
David Parkhurst
6d575967d4 strcpy_safe and strcat_safe 2023-11-14 14:37:25 -07:00
Charlton, Scott R
0cb7f62994 No memory leaks; Still need to turn-on Fortran 2023-08-10 11:01:24 -06:00
Darth Vader
32fbc5ab56 Merge commit '050663209be623e2af35e3f93a41ac6f5ac1f18f' 2023-05-26 04:27:58 +00:00
Charlton, Scott R
8a1e3f9711 Added sleeps after curl -X POST 2023-05-25 20:24:19 -06:00
Darth Vader
813150bc86 Merge commit 'aff166b18426080aa53a136931d221f7afa810d3' 2023-04-10 18:27:31 +00:00
Charlton, Scott R
b4aa81fa76 pre-commit changes
use $ pre-commit run --all-files
2023-03-05 16:11:39 -07:00
Darth Vader
30169e617c Merge commit '3765e0cf266655280d362cdf5de35c25892959b6' 2021-10-31 19:41:44 +00:00
Charlton, Scott R
d3bdd8b54a added newlines for CRAN 2021-09-23 06:37:13 -07:00
Darth Vader
aa62814aa6 Merge commit '58b0d1fccfc6763e569bee30f4ab5e4122963ede' 2021-04-23 20:14:47 +00:00
Darth Vader
8080cbce1e Merge commit '4cee19d768863d8f09b3629ee36a11e1a6030f33' 2021-04-19 23:23:32 +00:00
Darth Vader
e224625f08 Merge commit '711b1d061cba1005f028d1b17b0bb34e2b2d9162' 2020-12-03 01:53:17 +00:00
Darth Vader
50016849a0 Merge commit '5128e1337b2edd39ac3d16d2a5ce1c7f1e5f0773' 2020-12-02 00:46:34 +00:00
Charlton, Scott R
a28c241478 reset for dlls 2020-09-29 10:27:55 -06:00
Charlton, Scott R
0b0fced395 added src/phreeqcpp/common/PHRQ_exports.h 2020-09-15 20:29:41 -06:00
Charlton, Scott R
2760ad0c36 added googletest and fixed some minor bugs 2020-08-25 12:27:15 -06:00
Darth Vader
74b541d42e Merge commit 'a87cd1fee89cf0076aa06b9018e8ad3b44566516' 2020-06-01 18:21:16 +00:00
Darth Vader
090f5e682b Merge commit '4f34fd04ff34668494863eab5312157ce746d862' 2020-01-28 17:16:16 +00:00
Scott Charlton
bb5bcbf15e fixed conflict on merge 2020-01-27 16:52:46 -07:00
Scott Charlton
b69210254f Added .gitlab-ci.yml 2020-01-18 23:37:32 -07:00
Scott R Charlton
63108ac76d Merge commit '6a49d41253c7705c0273262d0290389b18643d32' 2019-10-29 12:29:32 -06:00
Scott R Charlton
86c543395f Merge remote-tracking branch 'coupled/master' 2019-08-19 10:48:19 -06:00
Scott R Charlton
1b13e09db5 CRAN: replaced deprecated std::ptr_fun with lambda function 2019-08-19 10:40:46 -06:00
Scott R Charlton
aa34ac1153 Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113' 2019-06-05 20:44:26 -06:00
Scott Charlton
1d5c59a175 Add 'phreeqcpp/' from commit 'da9d06b423a87ed5eae503c0faf779ac11c96027'
git-subtree-dir: phreeqcpp
git-subtree-mainline: ba5f2ba885b4cc757201e28f9b4dce158f7cc66b
git-subtree-split: da9d06b423a87ed5eae503c0faf779ac11c96027
2018-07-31 16:56:09 -06:00