16 Commits

Author SHA1 Message Date
Scott R Charlton
679c637ed2 Merge commit '22077113d63c5f086de917486dcf4df678a9c464' 2019-11-18 22:29:32 -07:00
Scott R Charlton
63108ac76d Merge commit '6a49d41253c7705c0273262d0290389b18643d32' 2019-10-29 12:29:32 -06:00
Scott R Charlton
8412823930 Merge commit '5c53fb207238bc0e846123a7e0d71a48bd9976ab' 2019-06-17 17:34:25 -06:00
Scott R Charlton
aa34ac1153 Merge commit 'b3bf691b4964b3eedbaf04d6ee9bd35f98afb113' 2019-06-05 20:44:26 -06:00
Scott R Charlton
51fbb3d5b0 Merge commit '035a4e0f7db61f7256e63659b0e7853dd299263e' 2019-02-04 21:19:21 -07:00
Scott R Charlton
f90fc5afea Merge commit '2b14a9475c1cb0c64d3adaf67a907b63ea454c9c' 2019-01-28 18:19:55 -07:00
Scott R Charlton
65dbd2c15b Merge commit 'd99390113028519f41895af04cedba4a43258336' 2018-11-07 16:20:41 -07:00
Scott R Charlton
6e92ecf9ef Merge commit '92c81f9fdd43f175d302028b56e7edbab81a7d06' 2018-11-07 15:29:36 -07:00
Scott R Charlton
dbefc44f31 Merge commit '3cc84da8ceac5d4a819fc0a6779b7ca361c17226' 2018-11-07 14:39:33 -07:00
Scott R Charlton
c4fa021ec1 Merge commit '2977db4424a04e3643bb02d356984c7aa78d1fde' 2018-10-19 20:14:33 -06:00
David Parkhurst
3a0292c695 revised lists to be cumulative for eq, gas, kin, ss 2018-08-23 16:37:14 -06:00
Scott Charlton
67d807ccf7 [IPhreeqc] added parens for clang++ -Wlogical-op-parentheses 2018-08-14 19:55:28 -07:00
Scott Charlton
af408f7c9a removed register keywords and updated for misc clang warnings 2018-08-14 16:11:36 -07:00
Scott Charlton
b447434d70 [iphreeqc] Changes for CRAN 3.4.7 2018-08-09 12:42:50 -06:00
Scott R Charlton
311fa04fe1 Merge commit '53148278fc5456fddfcffc2d46aa7ccb7fff0ee9' 2018-08-01 18:27:17 -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