Commit Graph

55 Commits

Author SHA1 Message Date
Syrus
b7d41e1e31 Merge branch 'master' into feature/improve-thread-safety-of-core-types
# Conflicts:
#	lib/api/src/instance.rs
#	lib/engine-jit/src/artifact.rs
#	lib/engine-native/src/artifact.rs
2020-07-23 15:29:13 -07:00
Syrus
5b8b54d088 Merge branch 'master' into singlepass-on-stable
# Conflicts:
#	Cargo.lock
#	lib/api/tests/externals.rs
2020-07-16 11:58:12 -07:00
Nick Lewycky
635f8a4284 Remove references to non-existant clippy.toml. 2020-07-10 14:49:37 -07:00
Mark McCaskey
f9bce8858b Merge branch 'master' into feature/improve-thread-safety-of-core-types 2020-07-09 13:57:58 -07:00
Syrus
92f8651312 Renamed wasmer_runtime to wasmer_vm 2020-07-07 21:26:06 -07:00