Merge branch 'master' into web

This commit is contained in:
Héctor Ramón Jiménez 2019-09-21 13:51:03 +02:00
commit 0a93be78b8
4 changed files with 4 additions and 2 deletions

View file

@ -23,6 +23,7 @@ iced_native = { version = "0.1.0-alpha", path = "../../native" }
# A personal `ggez` fork that introduces a `FontCache` type to measure text
# efficiently and fixes HiDPI issues.
ggez = { version = "0.5", git = "https://github.com/hecrj/ggez.git" }
env_logger = "0.6"
[target.'cfg(target_arch = "wasm32")'.dependencies]
iced_web = { path = "../../web" }