Merge branch 'master' into develop

author Mark Thom <[email protected]>

Fri, 27 Mar 2020 04:01:25 +0000 (22:01 -0600)

committer Mark Thom <[email protected]>

Fri, 27 Mar 2020 04:01:25 +0000 (22:01 -0600)
author Mark Thom <[email protected]>
Fri, 27 Mar 2020 04:01:25 +0000 (22:01 -0600)
committer Mark Thom <[email protected]>
Fri, 27 Mar 2020 04:01:25 +0000 (22:01 -0600)
diff --cc src/prolog/machine/machine_state.rs
Simple merge
diff --cc src/prolog/macros.rs
Simple merge
diff --cc src/prolog/toplevel.pl
Simple merge
author	Mark Thom <[email protected]>
	Fri, 27 Mar 2020 04:01:25 +0000 (22:01 -0600)
committer	Mark Thom <[email protected]>
	Fri, 27 Mar 2020 04:01:25 +0000 (22:01 -0600)
		1	2
src/prolog/machine/machine_state.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/prolog/macros.rs	patch \|	diff1 \|	diff2 \|	blob \| history
src/prolog/toplevel.pl	patch \|	diff1 \|	diff2 \|	blob \| history