1698 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Darth Vader	870f0f08cd	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	0c9d4081bf	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	b6fffd47be	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	7cbba0ec01	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	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	621401d34c	reset for dlls	2020-09-29 10:27:55 -06:00
Darth Vader	c03b987cf4	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
Darth Vader	1f5428a912	Merge commit 'e562e09e9ae00671933f9800a302629f50d945dc'	2020-09-17 06:12:28 +00:00
Darth Vader	e562e09e9a	Merge commit '9319c9daf8fe76ef24cf4d262081e8cd0c8fc3fe'	2020-09-17 06:11:12 +00:00
Darth Vader	53ad340bdb	Merge commit 'ea2c663c90fe84a9c191eac91286bb2afed4bd15'	2020-09-17 06:10:31 +00:00
Darth Vader	9319c9daf8	Merge commit '5b816fa1fd82eb94e2702b6bd9df6066fb71267b'	2020-09-17 06:10:18 +00:00
Darth Vader	ea2c663c90	Merge commit '07717b1e931b4526f3c33921cd872577599410b6'	2020-09-17 06:09:05 +00:00
Darth Vader	7faca8486f	Merge commit '0b0fced395d40a23a1eb8514688a812c13e4db02'	2020-09-17 06:08:08 +00:00
Charlton, Scott R	5b816fa1fd	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	07717b1e93	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	0b0fced395	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	abb80b511f	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	d8c638fba3	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00
Charlton, Scott R	c8be5daebc	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00
Charlton, Scott R	b030a0b9db	Merge remote-tracking branch 'origin/master' into gtest	2020-09-07 22:25:59 -06:00
Darth Vader	5ab593e6a4	Merge commit '18e137ff556c9e9410d9cb995bfc0369891bc484'	2020-09-06 04:14:42 +00:00
Darth Vader	18e137ff55	Merge commit '87bbb6a6f08a3f6cf0e4122e9c080db4ef000344'	2020-09-06 04:13:56 +00:00
Charlton, Scott R	87bbb6a6f0	adjusted alignment for utf-8 strings	2020-09-05 21:06:50 -07:00
Darth Vader	6e38872a51	Merge commit '3782d4420d3d6282315acfecf33b3c7e7da333d0'	2020-09-04 23:44:03 +00:00
Darth Vader	3782d4420d	Merge commit '03bda166155a6b2ce652e4ad6aceaf807c3bc041'	2020-09-04 23:43:25 +00:00
Charlton, Scott R	03bda16615	added write_banner to non-DOS and added UTF8 define	2020-09-03 13:11:57 -07:00
Charlton, Scott R	995de526c0	converted to utf-8	2020-09-03 12:54:51 -06:00
Darth Vader	c1077d709d	Merge commit 'd4261840c7f7720e5a76a941790ce48d40480097'	2020-08-31 03:46:03 +00:00
Darth Vader	d4261840c7	Merge commit 'fc8fe3e98fb3f1e42482636938537ed6028b3ee6'	2020-08-31 03:45:31 +00:00
Charlton, Scott R	fc8fe3e98f	re-added src/ZedGraph.dll	2020-08-30 21:42:00 -06:00
Darth Vader	99b48a4f49	Merge commit '6e7023f8428a4bfde82f7dc83287ae95b38f1d6b'	2020-08-31 01:56:04 +00:00
Darth Vader	6e7023f842	Merge commit 'fbae3e92947cf79c1d615e657192eb8d5c78b9e9'	2020-08-31 01:55:19 +00:00
David Parkhurst	fbae3e9294	code change for extending porosity definition. Change to TonyLitharge2a	2020-08-30 15:40:08 -06:00
Charlton, Scott R	46257e7349	added googletest and fixed some minor bugs	2020-08-25 12:27:15 -06:00
Charlton, Scott R	13ca055192	added googletest and fixed some minor bugs	2020-08-25 12:27:15 -06:00
Charlton, Scott R	2760ad0c36	added googletest and fixed some minor bugs	2020-08-25 12:27:15 -06:00
Charlton, Scott R	c459903476	added googletest and fixed some minor bugs	2020-08-25 12:27:15 -06:00
Charlton, Scott R	dd058e3bec	implemented Get/SetErrorOn	2020-08-25 12:17:54 -06:00
Charlton, Scott R	e221f73ce7	implemented Get/SetErrorOn	2020-08-25 12:17:54 -06:00