]> Repositorios git - scryer-prolog.git/commit
projects / scryer-prolog.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 3cf3c0e ec450fc)
Merge branch 'master' into library-use-case
authorNicolas Luck <[email protected]>
Thu, 3 Aug 2023 18:16:32 +0000 (20:16 +0200)
committerNicolas Luck <[email protected]>
Thu, 3 Aug 2023 18:16:32 +0000 (20:16 +0200)
commit48a483581952920fb4fa5e4fdcd7eaca9b723be0
tree5c5cc648323c132088bcbd5037fafdd8549c2282tree | snapshot
parent3cf3c0ea99dcdf795f48800efcd4bc7819f8528ecommit | diff
parentec450fc567b7da959b3930073226034711c7cbaecommit | diff
Merge branch 'master' into library-use-case

# Conflicts:
# Cargo.lock
# Cargo.toml
# src/bin/scryer-prolog.rs
# src/loader.pl
# src/machine/mock_wam.rs
# src/machine/mod.rs
# src/machine/system_calls.rs
Cargo.lock diff1 | diff2 | blob | history
Cargo.toml diff1 | diff2 | blob | history
src/bin/scryer-prolog.rs diff1 | diff2 | blob | history
src/lib.rs diff1 | diff2 | blob | history
src/loader.pl diff1 | diff2 | blob | history
src/machine/machine_state.rs diff1 | diff2 | blob | history
src/machine/mock_wam.rs diff1 | diff2 | blob | history
src/machine/mod.rs diff1 | diff2 | blob | history
src/machine/parsed_results.rs diff1 | | blob | history
src/machine/system_calls.rs diff1 | diff2 | blob | history
src/toplevel.pl diff1 | diff2 | blob | history
FORK: A modern Prolog implementation written mostly in Rust