3212 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Darth Vader	e0069f38b0	Merge commit '4c2095935e961b283301ecf611817babb1197cc3'	2020-12-02 00:38:05 +00:00
Darth Vader	017392317a	Merge commit '50073d4cfba1d3bcde6da914b8cbeefd7ece4944'	2020-12-02 00:38:02 +00:00
Charlton, Scott R	f672ec30bb	[iphreeqc] updated image location	2020-12-01 17:36:14 -07:00
Charlton, Scott R	4c2095935e	[phreeqc3] updated image location	2020-12-01 15:33:48 -07:00
Charlton, Scott R	50073d4cfb	[phreeqc3] updated image location	2020-12-01 15:33:48 -07:00
David Parkhurst	6227f660bf	added ADD_HEADING for IPhreeqc	2020-11-24 20:50:05 -07:00
David Parkhurst	e7326214b2	Added EOL_NOTAB$ and NO_NEWLINE$, updated release notes	2020-11-24 14:09:28 -07:00
Charlton, Scott R	e34a2bbeb7	removed zedgraph files from non-CLR builds	2020-10-29 13:11:05 -06:00
Charlton, Scott R	d8415fd94b	Merge remote-tracking branch 'origin/master'	2020-10-29 12:31:33 -06:00
Charlton, Scott R	2cb10fb65e	added missing files to dist	2020-10-29 12:30:27 -06:00
Charlton, Scott R	2cd47cb4a6	updated list of sed files	2020-10-29 11:04:41 -06:00
Darth Vader	201aee11f5	Merge commit 'f39a9de6b5a95e44f8802517bba5417bbe202c29'	2020-10-29 02:45:30 +00:00
Darth Vader	1d121e2b73	Merge commit 'aa055fc9a1476dde6dd1e7b317aa12ebe8d54e72'	2020-10-29 02:45:28 +00:00
Charlton, Scott R	fbfc472983	added README to examples	2020-10-28 20:43:30 -06:00
Charlton, Scott R	f39a9de6b5	added README to examples	2020-10-28 20:43:30 -06:00
Charlton, Scott R	aa055fc9a1	added README to examples	2020-10-28 20:43:30 -06:00
Darth Vader	f01587bf86	Merge commit 'f5e8d59e52c3c52aa75f5bc2e8499384da6012dd'	2020-10-29 00:06:04 +00:00
Darth Vader	2b00e9d01d	Merge commit 'e1f78666d09bf72da079fa1d682c2316bb1ded09'	2020-10-29 00:06:01 +00:00
Charlton, Scott R	e0a8584cec	Merge branch 'issue-create' into 'master' ... Updated examples to include CMakeLists.txt See merge request coupled/iphreeqc!20	2020-10-28 23:54:45 +00:00
Charlton, Scott R	f5e8d59e52	added CMakeLists.txt to examples	2020-10-28 17:29:24 -06:00
Charlton, Scott R	e1f78666d0	added CMakeLists.txt to examples	2020-10-28 17:29:24 -06:00
Charlton, Scott R	fabf9d4443	added CMakeLists.txt to examples	2020-10-28 17:29:24 -06:00
Charlton, Scott R	c311b23bc3	fixed to run on linux; cleaned examples	2020-10-28 15:11:29 -06:00
Charlton, Scott R	23fa9771e8	fixed to run on linux; cleaned examples	2020-10-28 15:11:29 -06:00
Charlton, Scott R	210439c36a	fixed to run on linux; cleaned examples	2020-10-28 15:11:29 -06:00
Charlton, Scott R	7762569cae	create sln and makefiles on install	2020-10-28 10:52:38 -06:00
Charlton, Scott R	b806b17fd8	Updated POSTFIX	2020-10-21 12:18:06 -06:00
Charlton, Scott R	e89e3ae14a	added missing cd command	2020-10-21 12:17:23 -06:00
Charlton, Scott R	f521ea9f98	updated jenkins-dist.sh for using-cmake example	2020-09-29 16:51:51 -06:00
Charlton, Scott R	7cada4e12d	updated using-cmake README.txt	2020-09-29 16:49:15 -06:00
Darth Vader	7797f6ed98	Merge commit '055ebf5c1ffe61bba8b37743f1bddd93007131b9'	2020-09-29 22:14:55 +00:00
Darth Vader	055ebf5c1f	Merge commit '2b4dbbdb167b77809e7c89bbec406810aa28162a'	2020-09-29 22:14:23 +00:00
Darth Vader	2b4dbbdb16	Merge commit 'cd51d8aeed46909e5f028a19089acfef43d6ede9'	2020-09-29 22:13:38 +00:00
Darth Vader	a18dfa35a0	Merge commit '589d88ff89b061b46289530165ad032642fbdaa4'	2020-09-29 22:13:03 +00:00
Darth Vader	589d88ff89	Merge commit 'f2023c4d83f55cbf4598ae8e308df3ef06b8f08c'	2020-09-29 22:12:01 +00:00
Darth Vader	a3dc6d20d3	Merge commit 'f4bf55d7bf26ca64edec1836ca4d2708427962ce'	2020-09-29 22:11:36 +00:00
Charlton, Scott R	f2023c4d83	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	f4bf55d7bf	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	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	20c11bc17e	IPhreeqc_interface must be compiled first	2020-09-29 16:05:52 -06:00
Charlton, Scott R	cd51d8aeed	reset for dlls	2020-09-29 10:27:55 -06:00
Charlton, Scott R	54161f4ae3	reset for dlls	2020-09-29 10:27:55 -06:00
Charlton, Scott R	a28c241478	reset for dlls	2020-09-29 10:27:55 -06: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
Darth Vader	e904f5b730	Merge commit '01c99a70a5baf72d53ae8e8f6db53948ddcd990c'	2020-09-24 04:29:35 +00:00
Charlton, Scott R	01c99a70a5	Merge remote-tracking branch 'github/master'	2020-09-23 22:25:35 -06:00
David Parkhurst	23f391743a	Merge remote-tracking branch 'scharlton2/master'	2020-09-23 15:49:19 -06:00
David Parkhurst	f6644e6e34	check for null pointer. Encoding for .out file	2020-09-23 15:47:05 -06:00
Charlton, Scott R	6ee61b9c21	Merge branch 'gtest' into 'master' ... Changed POST_BUILD to PRE_BUILD for when to copy dlls See merge request coupled/iphreeqc!18	2020-09-22 20:54:27 +00:00