]> Repositorios git - scryer-prolog.git/commit
projects / scryer-prolog.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: fab5ca9 1e60eee)
Merge branch 'master' into library-use-case
authorNicolas Luck <[email protected]>
Thu, 5 Oct 2023 10:06:30 +0000 (12:06 +0200)
committerNicolas Luck <[email protected]>
Thu, 5 Oct 2023 10:06:47 +0000 (12:06 +0200)
commit640c637ca81c8fe3112bbff557619e6112df71b4
tree2db1da6bfd07660dca7dfac29915d5172b34e742tree | snapshot
parentfab5ca9440ce4391b2ed83647ac45a70a456a3cfcommit | diff
parent1e60eeef3450cdb6817f8f626fb32be6018d83c2commit | diff
Merge branch 'master' into library-use-case

# Conflicts:
# Cargo.lock
# Cargo.toml
# src/http.rs
# 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/loader.pl diff1 | diff2 | blob | history
src/machine/machine_state.rs diff1 | diff2 | blob | history
src/machine/mod.rs diff1 | diff2 | blob | history
src/machine/system_calls.rs diff1 | diff2 | blob | history
FORK: A modern Prolog implementation written mostly in Rust