31 Commits

Author SHA1 Message Date
Max Lübke
088e15b2c1 Merge tag 'v3.8.5' into 5-bump-to-upstream-version-3-8-5 2024-12-04 08:05:51 +00:00
Darth Vader
51105d4518 Merge commit '5286d9779b0b7a7e46f43070248b68bb586fb6cc' 2024-11-21 00:30:07 +00:00
Darth Vader
efc186d887 Merge commit 'd7add6c470a3941ddca7923366c7b762e7ad095e' 2024-11-19 21:21:33 +00:00
Charlton, Scott R.
4507e96f79 Re-encoded ex22 to utf-8 2024-11-19 12:56:43 -07:00
Darth Vader
0d529e8de7 Merge commit '777e6ee471ada761562a1fecaeaaa0d0f52d9e75' 2024-11-14 01:37:20 +00:00
Max Lübke
7cc00e335a Bump Phreecq to version 3.8.2 2024-10-23 13:43:30 +02:00
Darth Vader
1f4d25addd Merge commit '5e097488473b575dc5098dbdd1fd5056f916fe06' 2024-10-22 01:03:15 +00:00
Darth Vader
59bd52a814 Merge commit '576b481d529b6a029304b8f6975042e138c6b4e3' 2024-10-12 01:16:51 +00:00
Darth Vader
268af62ea6 Merge commit 'e39aae3a9e6936b6da0bce51b9103524a426a247' 2024-10-08 22:02:50 +00:00
Darth Vader
0f4e8b662f Merge commit '4c9657948b0bce7ecbeb227d390394f35a61ef7f' 2024-10-08 20:05:51 +00:00
Darth Vader
c97ce7fb50 Merge commit '6dc784c5e91beeb719846fcee40b21dcfde28f81' 2024-09-24 22:03:36 +00:00
Darth Vader
0c070e5710 Merge commit 'f5b9d3f0a9df756ddee8322eab1cdb4581044f8c' 2024-08-29 19:01:30 +00:00
Darth Vader
72fef24c63 Merge commit 'a186ba7c06c9851eab58b0554c0a772f129a6ee1' 2024-06-07 21:57:03 +00:00
Darth Vader
dd0206a749 Merge commit 'a71e9dca90ec11a4f8c46c8b1af4f9ebed20ea32' 2024-05-27 19:32:10 +00:00
Darth Vader
6c0ef8941c Merge commit '1d46928b3cb13921432063016bc92a25111435c2' 2024-05-09 19:46:54 +00:00
Darth Vader
8bd2c62315 Merge commit '9d0b5a7440499bf4adb70d39e2a743cc07f2380a' 2024-04-18 20:08:49 +00:00
Darth Vader
e64f73da33 Merge commit 'e53806d1564015bc179c2b479c305c5ac8a279b3' 2024-04-18 18:17:14 +00:00
Charlton, Scott R
90a6449de8 Updated for phreeqc changes
Introduce end-of-line normalization for CMakeLists.txt
2023-05-28 20:14:57 -06:00
Darth Vader
66386d144c Merge commit '4b937c611657c62e7ad1323f73fd6bd9101ba994' 2023-05-28 19:59:00 +00:00
Darth Vader
3b5b63b76e Merge commit 'f2563d54bd140a3da9c35dbeabe15a3170361499' 2023-05-26 04:22:38 +00:00
Darth Vader
ef0fddfc4a Merge commit '0585087c9230a8e8e30c00f463c62dbf547717c5' 2023-01-17 03:31:27 +00:00
Darth Vader
4eef971052 Merge commit '0fe41c1648e1a6801a86b5ae7501763c6d463ae8' 2023-01-09 01:56:16 +00:00
Charlton, Scott R
ab6bae23a2 [webmod] updated date 2020-12-02 20:26:08 -07:00
Darth Vader
89bcdffc1f Merge commit 'd2ea5947e5a2313d00ea80759852da322717aa46' 2020-12-02 00:38:06 +00:00
Darth Vader
2c6c70e2f2 Merge commit 'f464c3c4fb0a15e4cda1dee764cea396929a2781' 2020-09-04 23:44:06 +00:00
Darth Vader
74fec83aeb Merge commit 'a9303d1835693899838c430bb56555b32c986558' 2020-01-28 17:13:21 +00:00
Darth Vader
49340c85ac Merge commit '6d4acba199989882c9520ff3e723d756f765f382' 2020-01-27 22:09:40 +00:00
Scott Charlton
9273992482 Added .gitlab-ci.yml 2020-01-18 23:42:45 -07:00
Scott R Charlton
9a3e5a6b5e Merge commit 'e6e3f30aa9afedbd49b0fa906ababe8e45ce2e1e' 2018-11-08 00:51:29 -07:00
Scott R Charlton
2d9b3ec029 Merge commit '4128d5d4add166abeae94510dd83e663e2957c07' 2018-11-07 23:14:50 -07:00
Scott Charlton
d5345a7aee Add 'phreeqc3-examples/' from commit 'e977363da4c1ae1708ebddca38d5312b6813a337'
git-subtree-dir: phreeqc3-examples
git-subtree-mainline: 8de0e98ed90bb2b639659c820168ab18c1062992
git-subtree-split: e977363da4c1ae1708ebddca38d5312b6813a337
2018-07-31 16:55:50 -06:00