summaryrefslogtreecommitdiffstats
path: root/winit/src/icon.rs (follow)
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into feat/multi-window-supportLibravatar Bingus2023-07-121-168/+49
| | | | | | | | | | | | | | | | | | | | | | # Conflicts: # Cargo.toml # core/src/window/icon.rs # core/src/window/id.rs # core/src/window/position.rs # core/src/window/settings.rs # examples/integration/src/main.rs # examples/integration_opengl/src/main.rs # glutin/src/application.rs # native/src/subscription.rs # native/src/window.rs # runtime/src/window/action.rs # src/lib.rs # src/window.rs # winit/Cargo.toml # winit/src/application.rs # winit/src/icon.rs # winit/src/settings.rs # winit/src/window.rs
* Merge remote-tracking branch 'iced-main/master' into feat/multi-window-supportLibravatar bungoboingo2023-02-281-1/+7
| | | | | | # Conflicts: # glutin/src/application.rs # winit/src/icon.rs
* Merge remote-tracking branch 'origin/master' into feat/multi-window-supportLibravatar Bingus2023-02-151-9/+6
| | | | | | | # Conflicts: # native/src/command/action.rs # native/src/window/action.rs # winit/src/window.rs
* move window settings to `iced_native`Libravatar Richard2023-01-091-0/+179