14 Commits

Author SHA1 Message Date
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