Skip to content

Commit

Permalink
Merge branch 'develop' into show_meta_data
Browse files Browse the repository at this point in the history
  • Loading branch information
hacknus authored Dec 3, 2024
2 parents a64cdd1 + 7664483 commit 29c378e
Show file tree
Hide file tree
Showing 11 changed files with 64 additions and 18 deletions.
47 changes: 46 additions & 1 deletion CHANGELOG.md

Large diffs are not rendered by default.

1 change: 1 addition & 0 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ eframe = { version = "0.29.1", default-features = false, features = [
"glow",
"persistence",
] }
egui-file-dialog = { path = "." }

[package]
name = "egui-file-dialog"
Expand Down
4 changes: 2 additions & 2 deletions examples/custom-right-panel/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../"}
eframe.workspace = true
egui-file-dialog.workspace = true
4 changes: 2 additions & 2 deletions examples/multi_selection/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../"}
eframe.workspace = true
egui-file-dialog.workspace = true
4 changes: 2 additions & 2 deletions examples/multilingual/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../"}
eframe.workspace = true
egui-file-dialog.workspace = true
4 changes: 2 additions & 2 deletions examples/multiple_actions/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../"}
eframe.workspace = true
egui-file-dialog.workspace = true
4 changes: 2 additions & 2 deletions examples/persistence/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../" }
eframe.workspace = true
egui-file-dialog.workspace = true
4 changes: 2 additions & 2 deletions examples/pick_directory/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../"}
eframe.workspace = true
egui-file-dialog.workspace = true
4 changes: 2 additions & 2 deletions examples/pick_file/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../"}
eframe.workspace = true
egui-file-dialog.workspace = true
2 changes: 1 addition & 1 deletion examples/sandbox/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,4 @@ edition = "2021"

[dependencies]
eframe = { workspace = true, features = ["serde", "ron"] }
egui-file-dialog = { path = "../../" }
egui-file-dialog.workspace = true
4 changes: 2 additions & 2 deletions examples/save_file/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ edition = "2021"
# See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html

[dependencies]
eframe = { workspace = true }
egui-file-dialog = { path = "../../"}
eframe.workspace = true
egui-file-dialog.workspace = true

0 comments on commit 29c378e

Please sign in to comment.