Charlton, Scott R
|
6d01aab759
|
Merge branch 'gtest' into 'master'
Reset dllexport; fixed doxygen example tests
See merge request coupled/iphreeqc!19
|
2020-09-29 22:09:46 +00:00 |
|
Charlton, Scott R
|
f7d7fef7a0
|
reset for dlls
|
2020-09-29 10:27:55 -06:00 |
|
Darth Vader
|
3cf119c58a
|
Merge commit 'e904f5b730e622046aedacf704a6e888654c7517'
|
2020-09-24 04:31:32 +00:00 |
|
Charlton, Scott R
|
3091de68dd
|
added src/phreeqcpp/common/PHRQ_exports.h
|
2020-09-15 20:29:41 -06:00 |
|
Charlton, Scott R
|
46d8cf8a96
|
Merge remote-tracking branch 'origin/master' into gtest
|
2020-09-07 22:25:59 -06:00 |
|
Darth Vader
|
83dd32ebee
|
Merge commit '18e137ff556c9e9410d9cb995bfc0369891bc484'
|
2020-09-06 04:14:42 +00:00 |
|
Darth Vader
|
133d10ed3e
|
Merge commit '3782d4420d3d6282315acfecf33b3c7e7da333d0'
|
2020-09-04 23:44:03 +00:00 |
|
Darth Vader
|
ab72db8a7d
|
Merge commit 'd4261840c7f7720e5a76a941790ce48d40480097'
|
2020-08-31 03:46:03 +00:00 |
|
Darth Vader
|
4eed6ebce4
|
Merge commit '6e7023f8428a4bfde82f7dc83287ae95b38f1d6b'
|
2020-08-31 01:56:04 +00:00 |
|
Charlton, Scott R
|
5c61108b60
|
added googletest and fixed some minor bugs
|
2020-08-25 12:27:15 -06:00 |
|
Charlton, Scott R
|
1059b78bb4
|
implemented Get/SetErrorOn
|
2020-08-25 12:17:54 -06:00 |
|
Darth Vader
|
4ef7ef9cf1
|
Merge commit 'b138ed208df65cd4653ea7a2e07332a3d3e1c8b2'
|
2020-08-20 02:38:58 +00:00 |
|
Darth Vader
|
0dd7946849
|
Merge commit '5631ce1e56cda328e8efac33a0ee998a7fd27489'
|
2020-08-18 19:59:27 +00:00 |
|
Darth Vader
|
093a1e5b49
|
Merge commit '9d480bc124a4e9e979b4995476d086f90e3833e7'
|
2020-08-13 17:49:43 +00:00 |
|
Darth Vader
|
719e939008
|
Merge commit 'ea21e58a8f9bd9ae4de057ca2422d8a4f399826c'
|
2020-07-23 16:02:57 +00:00 |
|
Darth Vader
|
f0bdd44c92
|
Merge commit '9029c2bcba781cba475c035d5fb81f83c8ec56fa'
|
2020-07-16 01:05:35 +00:00 |
|
Darth Vader
|
c4547400ec
|
Merge commit '74b541d42e40ef1ed8df0bfba9826e55b046e9f0'
|
2020-06-01 18:21:57 +00:00 |
|
Darth Vader
|
302bfb4730
|
Merge commit '1c3edaa7473043f049372de76a3d622b45d3fed3'
|
2020-05-22 22:16:27 +00:00 |
|
Darth Vader
|
2b8849fe36
|
Merge commit '89ca3d279fed2341cf35bc240da008836972fc7e'
|
2020-02-22 03:19:15 +00:00 |
|
Darth Vader
|
e9720fd76b
|
Merge commit 'a208e3948a804c8fb689fa980739e341b6696a32'
|
2020-01-28 18:26:36 +00:00 |
|
Darth Vader
|
38f2d8f21c
|
Merge commit '090f5e682b8b44251566a2624fe8189744f727c5'
|
2020-01-28 17:17:47 +00:00 |
|
Darth Vader
|
297567df2a
|
Merge commit '9bcc875c9ed6ddb30a29500ca89de8f9281bac80'
|
2020-01-28 16:45:18 +00:00 |
|
Darth Vader
|
17388e741a
|
Merge commit 'bb5bcbf15eb0ff4efe3dceb70b3682fd6a59f47f'
|
2020-01-27 23:54:30 +00:00 |
|
Darth Vader
|
77380716f2
|
Merge commit 'efbddbf6dc5b3bca3076b50d39c42a196ae551c8'
|
2020-01-27 02:06:21 +00:00 |
|
Scott Charlton
|
9273992482
|
Added .gitlab-ci.yml
|
2020-01-18 23:42:45 -07:00 |
|
Scott R Charlton
|
4968927900
|
Merge commit '757927da596446462e8daceb57b20bba2c591f33'
|
2020-01-02 19:25:18 -07:00 |
|
Scott R Charlton
|
a8c1876a1e
|
Merge commit '0366caf10b0748d78cb718898c714e1397a008b4'
|
2019-12-13 10:20:33 -07:00 |
|
Scott R Charlton
|
956374d767
|
Merge commit 'd97736a3a718c05c91a3aa6eb567c18538464436'
|
2019-12-03 13:29:35 -07:00 |
|
Scott R Charlton
|
675562bc6a
|
IPhreeqc: ifdef'd out references to std::cerr and std::cout
|
2019-11-23 21:14:02 -07:00 |
|
Scott R Charlton
|
abfc6ed0ba
|
Merge commit 'e5bf8b0aa61996d6b4ee40820a7b7f79cb649444'
|
2019-11-19 19:50:40 -07:00 |
|
Scott R Charlton
|
4e3de48388
|
Merge commit 'fd242bd33f1f6b3b91cd6d4f5a5336db0edfa81e'
|
2019-11-19 14:20:33 -07:00 |
|
Scott R Charlton
|
80957cedf0
|
Merge commit '3049467b561ef8176c81341b76b883b2179380f2'
|
2019-11-19 12:41:28 -07:00 |
|
Scott R Charlton
|
824881645b
|
Merge commit 'd7188d25f30f33d2158082341224dda94f4bc1cc'
|
2019-11-19 09:40:14 -07:00 |
|
Scott R Charlton
|
3241529210
|
Merge commit '679c637ed207c2a2418be64d4ee1ca140073ba90'
|
2019-11-18 22:29:45 -07:00 |
|
Scott R Charlton
|
a22beccc3d
|
Merge commit '63108ac76d6fa7c378c21690b6342333c4cb446c'
|
2019-10-30 11:10:37 -06:00 |
|
Scott R Charlton
|
b390aae363
|
Merge commit '86888c465e9f7ff2ab6e5dfea003fc6ba73383b6'
|
2019-10-21 16:25:10 -06:00 |
|
Scott R Charlton
|
f8a0737a56
|
Merge remote-tracking branch 'coupled/master'
|
2019-08-19 10:48:19 -06:00 |
|
Scott R Charlton
|
a174361c5a
|
CRAN: replaced deprecated std::ptr_fun with lambda function
|
2019-08-19 10:40:46 -06:00 |
|
Scott R Charlton
|
055c882d64
|
Merge commit '5b3379b947de79f9182a880a74500f50dc234f54'
|
2019-06-18 18:29:56 -06:00 |
|
Scott R Charlton
|
b999fe9381
|
Merge commit '8412823930dd6ea12f1be8dbbe64c50354748df2'
|
2019-06-17 17:34:37 -06:00 |
|
Scott R Charlton
|
eb961c7946
|
Merge commit 'aa34ac11538c27f39c44c34938411f1e00afce19'
|
2019-06-05 20:44:38 -06:00 |
|
Scott R Charlton
|
91e66b4383
|
Merge commit '79c28e50c1ac44195f0aafc8279f601f1f40c836'
|
2019-05-06 15:44:30 -06:00 |
|
Scott R Charlton
|
e12f551bda
|
Merge commit '94155a63c62b057011f9c961e240e0e04721ca05'
|
2019-02-05 23:49:55 -07:00 |
|
Scott R Charlton
|
cf8fe19f36
|
Merge commit '51fbb3d5b08d20592bbc358d2f7ca25b75c74691'
|
2019-02-04 21:19:44 -07:00 |
|
Scott R Charlton
|
978e9a30ee
|
Merge commit '1e4a2941b3b1d0cecacd0bba8c0252b87e74dca8'
|
2019-01-30 21:34:42 -07:00 |
|
Scott R Charlton
|
05edd6ff43
|
Merge branch 'issue-3' into 'master'
Fixed -Wcatch-value warnings reported by CRAN
Closes #3
See merge request coupled/IPhreeqc!8
|
2019-01-30 18:12:57 -07:00 |
|
Scott R Charlton
|
68c670c78c
|
Merge branch 'issue-2' into 'master'
Issue 2
See merge request coupled/IPhreeqc!7
|
2019-01-30 17:12:46 -07:00 |
|
Scott Charlton
|
9c72ce05b8
|
Fixed -Wcatch-value warnings reported by CRAN
|
2019-01-29 16:04:01 -08:00 |
|
Scott R Charlton
|
4c55618987
|
Merge commit '548aead510d42fd3998eb74be8a5f94396c69bea'
|
2019-01-29 11:10:59 -07:00 |
|
Scott R Charlton
|
a2d4b5222e
|
Merge commit '12df06b34cba4744a36bf519bb7298caf98a320a'
|
2019-01-28 22:14:47 -07:00 |
|