37 Commits

Author SHA1 Message Date
Darth Vader
60ad724c7a Merge commit 'e4bd9bafb40c82bff5ef275528ca3dd2836672e5' 2021-09-08 14:35:13 +00:00
Darth Vader
fd78a499d0 Merge commit '8d7c1fce37a929778a2c34ee19c29933529f46bc' 2021-08-27 16:05:15 +00:00
Darth Vader
d4dfe590eb Merge commit '07a864d1a6ed582ddfae5e1c3bf5b0620c3dd75c' 2021-08-17 15:35:22 +00: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
639490d061 Merge commit '2e5f255c794096790125293dcc3af274bed7a61a' 2021-04-07 14:27:20 +00:00
Darth Vader
b1efa4f251 Merge commit '7961b1686b4e064ec4ec886e76543074d060129f' 2021-04-06 16:04:54 +00:00
Darth Vader
4ca2e4e1f4 Merge commit '885a2f77289ac2738f6e8e02c8039f7e26ee7828' 2021-03-24 16:45:00 +00:00
Darth Vader
7b0c2df096 Merge commit '1986e00a933549022abb335d82f40c65abf2a292' 2021-03-22 23:37:01 +00:00
Darth Vader
5688f83747 Merge commit '0feb20dead731b8dedf3e86d5ef664bc24733127' 2021-03-18 05:41:57 +00:00
Darth Vader
710d0096aa Merge commit '6a5bb8aba56d568bd139bc3aed7363d929397790' 2021-03-12 16:57:10 +00:00
Darth Vader
e904f5b730 Merge commit '01c99a70a5baf72d53ae8e8f6db53948ddcd990c' 2020-09-24 04:29:35 +00:00
Darth Vader
3782d4420d Merge commit '03bda166155a6b2ce652e4ad6aceaf807c3bc041' 2020-09-04 23:43:25 +00:00
Darth Vader
5631ce1e56 Merge commit '801812ded3961b37ed264997211694bd0563d554' 2020-08-18 19:58:22 +00:00
Darth Vader
1c3edaa747 Merge commit 'e1465e33228a3f867bd822405fb100614d5f6d0c' 2020-05-22 22:15:37 +00:00
Darth Vader
89ca3d279f Merge commit 'e18e1ec6be5107e051f99e41103638c907b1eaf5' 2020-02-22 03:17:53 +00:00
Scott R Charlton
757927da59 Merge commit 'ae06f3533db376699e82c3b0b183fb2bdd43721a' 2020-01-02 19:25:04 -07:00
Scott R Charlton
d97736a3a7 Merge commit '79f768a7bd6c88e064ba25a33880cb84cfd1489f' 2019-12-03 13:29:23 -07:00
Scott R Charlton
e5bf8b0aa6 Merge commit '6067ce8ce599b9cbfaf012c0abc377f20e616b42' 2019-11-19 19:49:57 -07:00
Scott R Charlton
3049467b56 Merge commit '443be1cdb1adce5a8da310d883bf4d97fc661576' 2019-11-19 12:40:34 -07:00
Scott R Charlton
d7188d25f3 Merge commit '6dafd7d75e3dc4b97ed0b5efa7424bf0630829e0' 2019-11-19 09:39:46 -07:00
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