Merge branch 'master' into merge-master-to-web

This commit is contained in:
Ryan Goldstein 2019-09-30 11:19:12 -04:00
commit e21df5831e
5 changed files with 17 additions and 9 deletions

View file

@ -25,7 +25,7 @@ libc = "0.2"
log = "0.4"
serde = { version = "1", optional = true, features = ["serde_derive"] }
derivative = "1.0.2"
raw-window-handle = "0.2.0"
raw-window-handle = "0.2"
[dev-dependencies]
image = "0.21"