Merge remote-tracking branch 'origin/master' into feat/multi-window-support

Browse source

# 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

...

This commit is contained in:

Bingus 2023-07-12 12:23:18 -07:00

parent 41836dd80d 21bd51426d

commit 633f405f3f

No known key found for this signature in database

GPG key ID: 5F84D2AA40A9F170

394 changed files with 17278 additions and 13290 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

1405

widget/src/text_input.rs Normal file

View file

File diff suppressed because it is too large Load diff