3168 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
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
Charlton, Scott R	d4bc4b30a0	Changed POST_BUILD to PRE_BUILD for when to copy dlls	2020-09-21 21:24:00 -06:00
Charlton, Scott R	dcac7dd759	Merge branch 'gtest' into 'master' ... added gtest to dist See merge request coupled/iphreeqc!17	2020-09-21 00:52:12 +00:00
Charlton, Scott R	0b3002ad87	added gtest to dist	2020-09-20 18:49:25 -06:00
Charlton, Scott R	7423ec64d6	added gtest_discover_tests	2020-09-18 16:37:20 -06:00
Darth Vader	2ddf3ef853	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	dd9cd0ef4c	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	5cc3d6af14	Merge commit '0b0fced395d40a23a1eb8514688a812c13e4db02'	2020-09-17 06:08:08 +00:00
Charlton, Scott R	19a4576e67	Merge branch 'gtest' into 'master' ... Updated cmake build See merge request coupled/iphreeqc!16	2020-09-17 06:05:12 +00:00
Charlton, Scott R	089e872532	Added using-cmake files to automake files	2020-09-16 22:48:15 -07:00
Charlton, Scott R	dbba3f26dc	implemented SOVERSION for shared libs	2020-09-16 21:40:45 -07:00
Charlton, Scott R	07717b1e93	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	5b816fa1fd	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	3091de68dd	added src/phreeqcpp/common/PHRQ_exports.h	2020-09-15 20:29:41 -06:00
Charlton, Scott R	093f8e99ca	reverted IPhreeqc_SRC mistake	2020-09-15 16:48:46 -06:00
Charlton, Scott R	95dded5cf3	added missing CMakeLists.txt.in	2020-09-14 14:26:24 -07:00
Charlton, Scott R	03c40d1f51	added default build type	2020-09-14 14:12:59 -07:00
Charlton, Scott R	bf17f90d8e	added newline	2020-09-11 19:44:28 -07:00
Charlton, Scott R	1d14855a15	turned off gmock build; reformatted	2020-09-11 18:36:53 -07:00
Charlton, Scott R	033f89bcfc	updated to not use gmock	2020-09-11 17:28:55 -06:00
Charlton, Scott R	aa178fd6fa	cleanup and added some gmock tests; gmock and BUILD_SHARED_LIBS seem to be incompatible (at least with gtest 1.8.1)	2020-09-11 16:35:28 -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	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	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
Charlton, Scott R	398094f99b	converted ISO-8859 to UTF-8	2020-09-05 16:09:31 -07:00
Darth Vader	e14af179c7	Merge commit 'beaab1d6367d813cfb97906dba4f7730915478c6'	2020-09-05 23:00:14 +00:00
Charlton, Scott R	fb20284340	Removed BOM	2020-09-05 16:46:52 -06:00
Darth Vader	2c6c70e2f2	Merge commit 'f464c3c4fb0a15e4cda1dee764cea396929a2781'	2020-09-04 23:44:06 +00:00
Darth Vader	a6db7050a7	Merge commit '3f25856273808861430aadfbca8a11b4c116812a'	2020-09-04 23:44:05 +00:00
Darth Vader	133d10ed3e	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
David Parkhurst	beaab1d636	more characters	2020-09-04 16:33:33 -06:00
David Parkhurst	6b8138c2f2	fixed degree sign	2020-09-04 16:22:09 -06:00
David Parkhurst	759cac1fd9	fixed some sit.dat characters	2020-09-04 16:17:01 -06:00
Charlton, Scott R	3f25856273	updated databases	2020-09-03 19:50:27 -07: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	f464c3c4fb	saved as utf-8	2020-09-03 13:07:53 -07:00
Charlton, Scott R	995de526c0	converted to utf-8	2020-09-03 12:54:51 -06:00