diff options
| author |  Bingus <shankern@protonmail.com> | 2023-01-18 15:01:17 -0800 |
|---|---|---|
| committer | Bingus <shankern@protonmail.com> | 2023-01-18 15:01:17 -0800 |
| commit | 70d487ba20a50c06c73f0ffcd8198f1a7eac7f37 (patch) | |
| tree | afb8e161b18236d4440cba8bb0e0ce896858d653 /winit/src/lib.rs | |
| parent | 790fa3e7a01a790aa3f07083fe9abf6b68fa7ba1 (diff) | |
| parent | 5ef0648bf447aaca8b96782643401e54a2bf7759 (diff) | |
| download | iced-70d487ba20a50c06c73f0ffcd8198f1a7eac7f37.tar.gz iced-70d487ba20a50c06c73f0ffcd8198f1a7eac7f37.tar.bz2 iced-70d487ba20a50c06c73f0ffcd8198f1a7eac7f37.zip | |
Merge remote-tracking branch 'origin/master' into feat/multi-window-support
# Conflicts:
# examples/events/src/main.rs
# glutin/src/application.rs
# native/src/window.rs
# winit/src/window.rs
Diffstat (limited to 'winit/src/lib.rs')
| -rw-r--r-- | winit/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/winit/src/lib.rs b/winit/src/lib.rs index 99a46850..76339a76 100644 --- a/winit/src/lib.rs +++ b/winit/src/lib.rs @@ -11,7 +11,7 @@ //! Additionally, a [`conversion`] module is available for users that decide to //! implement a custom event loop. //! -//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.6/native +//! [`iced_native`]: https://github.com/iced-rs/iced/tree/0.7/native //! [`winit`]: https://github.com/rust-windowing/winit //! [`conversion`]: crate::conversion #![doc( |