diff options
| author |  Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-12-04 04:01:12 +0100 |
|---|---|---|
| committer | Héctor Ramón Jiménez <hector0193@gmail.com> | 2019-12-04 04:01:12 +0100 |
| commit | 561c3641c6ac62333550c3017561fa7a18663f00 (patch) | |
| tree | 3e0a502ab8e37679899002e4664a148fc474a087 /wgpu/Cargo.toml | |
| parent | 4293dcb2540144cc69a9f1370103bb780eca69f3 (diff) | |
| parent | 6c145bbb239e87569bf4aa797ea7f8d34e25cf62 (diff) | |
| download | iced-561c3641c6ac62333550c3017561fa7a18663f00.tar.gz iced-561c3641c6ac62333550c3017561fa7a18663f00.tar.bz2 iced-561c3641c6ac62333550c3017561fa7a18663f00.zip | |
Merge branch 'master' into feature/image-from-bytes
Diffstat (limited to 'wgpu/Cargo.toml')
| -rw-r--r-- | wgpu/Cargo.toml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/wgpu/Cargo.toml b/wgpu/Cargo.toml index f008a99c..47ec0537 100644 --- a/wgpu/Cargo.toml +++ b/wgpu/Cargo.toml @@ -4,14 +4,14 @@ version = "0.1.0" authors = ["Héctor Ramón Jiménez <hector0193@gmail.com>"] edition = "2018" description = "A wgpu renderer for Iced" -license = "MIT" +license = "MIT AND OFL-1.1" repository = "https://github.com/hecrj/iced" [dependencies] iced_native = { version = "0.1.0", path = "../native" } wgpu = "0.4" glyph_brush = "0.6" -wgpu_glyph = "0.6" +wgpu_glyph = { version = "0.7", git = "https://github.com/hecrj/wgpu_glyph", branch = "fix/font-load-panic" } raw-window-handle = "0.3" image = "0.22" glam = "0.8" |