Merge branch 'master' of https://github.com/mthom/rusty-wam

author Mark Thom <[email protected]>

Sat, 13 Jun 2020 00:28:07 +0000 (18:28 -0600)

committer Mark Thom <[email protected]>

Sat, 13 Jun 2020 00:28:07 +0000 (18:28 -0600)
author Mark Thom <[email protected]>
Sat, 13 Jun 2020 00:28:07 +0000 (18:28 -0600)
committer Mark Thom <[email protected]>
Sat, 13 Jun 2020 00:28:07 +0000 (18:28 -0600)
diff --cc src/clause_types.rs
Simple merge
diff --cc src/lib/pio.pl
Simple merge
diff --cc src/machine/system_calls.rs
Simple merge
author	Mark Thom <[email protected]>
	Sat, 13 Jun 2020 00:28:07 +0000 (18:28 -0600)
committer	Mark Thom <[email protected]>
	Sat, 13 Jun 2020 00:28:07 +0000 (18:28 -0600)
		1	2
src/clause_types.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/lib/pio.pl	patch \|	diff1 \|	diff2 \|	blob \| history
src/machine/system_calls.rs	patch \|	diff1 \|	diff2 \|	blob \| history