schaeff d8284dac19 solve conflict		2019-04-09 14:33:04 +02:00
..
lib	Merge branch 'develop' of github.com:JacobEberhardt/ZoKrates into bellman-backend-v2	2019-03-06 10:17:46 +01:00
src	solve conflict	2019-04-09 14:33:04 +02:00
tests	solve conflict	2019-04-09 14:33:04 +02:00
build.rs	remove tempdir	2019-02-07 18:25:20 +01:00
Cargo.lock	extract fs resolver into new crate, rename crates, refactor importer	2018-07-31 16:57:21 +02:00
Cargo.toml	fix following review: extract witness with write read, rename scheme to proving scheme, typos	2019-04-08 14:56:07 +02:00