Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions nannou/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ serde_derive = "1"
serde_json = "1"
toml = "0.5"
walkdir = "2"
wgpu_upstream = { version = "0.11", package = "wgpu" }
winit = "0.25"
wgpu_upstream = { version = "0.11.1", package = "wgpu" }
winit = "0.26"

[features]
default = ["notosans"]
Expand Down
2 changes: 1 addition & 1 deletion nannou_conrod/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ conrod_winit = "0.76"
nannou = { version ="0.18.0", path = "../nannou", default-features = false }
# Must be synchronised with the version used in the nannou dependency.
# Required for the winit event conversion function macro to work.
winit = "0.25"
winit = "0.26"

[features]
default = ["notosans"]
Expand Down
2 changes: 1 addition & 1 deletion nannou_wgpu/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ futures = { version = "0.3", features = ["executor", "thread-pool"] }
image = { version = "0.23", optional = true }
instant = { version = "0.1.9", optional = true }
num_cpus = { version = "1", optional = true }
wgpu_upstream = { version = "0.11", package = "wgpu" }
wgpu_upstream = { version = "0.11.1", package = "wgpu" }

[features]
capturer = ["image", "instant", "num_cpus"]
Expand Down