Merge branch 'master' into feature/event-subscriptions

This commit is contained in:
Héctor Ramón Jiménez 2019-12-08 06:53:54 +01:00
commit 9b84b6e403
13 changed files with 510 additions and 62 deletions

View file

@ -43,6 +43,8 @@ reqwest = "0.9"
rand = "0.7"
chrono = "0.4"
futures = "0.3"
iced_native = { version = "0.1", path = "./native" }
iced_wgpu = { version = "0.1", path = "./wgpu" }
[target.'cfg(target_arch = "wasm32")'.dev-dependencies]
wasm-bindgen = "0.2.51"