]> Repositorios git - scryer-prolog.git/commit
Merge branch 'master' into library-use-case
authorNicolas Luck <[email protected]>
Wed, 30 Aug 2023 16:12:26 +0000 (18:12 +0200)
committerNicolas Luck <[email protected]>
Wed, 30 Aug 2023 16:12:26 +0000 (18:12 +0200)
commit4d19c437e035d88e6d7c1dd120c25df2f5359592
tree0c572408ca6aaae8068da5d09b9586a4e775df88
parent44c274b9e9fbf2d6aefac84d7b14b72195076109
parent66f6399b8ada356fb93ff8b58517ce7a5488ecc0
Merge branch 'master' into library-use-case

# Conflicts:
# Cargo.toml
# src/machine/mock_wam.rs
# src/machine/mod.rs
Cargo.lock
Cargo.toml
src/atom_table.rs
src/bin/scryer-prolog.rs
src/lib.rs
src/machine/mod.rs
src/machine/system_calls.rs