migrations/egui
1
0
Fork 0
mirror of https://github.com/emilk/egui.git synced 2026-08-30 13:20:05 -04:00
Code Activity

Merge branch 'lucas/atoms-preferred-size' into lucas/experiments/measure-widget-size

Browse Source 
# Conflicts:
#	crates/egui/src/ui.rs
#	crates/egui/src/widgets/button.rs
#	crates/egui/src/widgets/label.rs
#	crates/egui_demo_lib/src/demo/popups.rs
#	crates/egui_extras/src/layout.rs
#	crates/epaint/src/text/text_layout_types.rs
This commit is contained in:
lucasmerlin
2025-06-16 09:52:22 +02:00
parent d72e85b6b4 cd3ac65c09
commit b85a1d95bc
389 changed files with 8660 additions and 3857 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
examples/hello_world_simple/Cargo.toml
View File

@@ -4,7 +4,7 @@ version = "0.1.0"
authors = ["Emil Ernerfeldt <emil.ernerfeldt@gmail.com>"]
license = "MIT OR Apache-2.0"
edition = "2021"
rust-version = "1.81"
rust-version = "1.84"
publish = false
[lints]