Skip to content

Commit d93dc75

Browse files
authored
Merge pull request #92 from yeastplume/wallet_import
Wallet Import functionality
2 parents 3eb74e0 + 3af84c6 commit d93dc75

File tree

15 files changed

+736
-184
lines changed

15 files changed

+736
-184
lines changed

Cargo.lock

Lines changed: 3 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
[package]
22
name = "grin-gui"
3-
version = "0.1.0-alpha.5"
3+
version = "0.1.0-alpha.6"
44
authors = ["Grin Developers <mimblewimble@lists.launchpad.net>"]
55
description = "GUI wrapping grin and grin-wallet. Simple, private and scalable cryptocurrency implementation based on the MimbleWimble chain format."
66
license = "Apache-2.0"
@@ -16,8 +16,8 @@ no-self-update = ["grin-gui-core/no-self-update"]
1616
debug = ["iced/debug"]
1717

1818
[dependencies]
19-
grin-gui-core = { version = "0.1.0-alpha.5", path = "crates/core", features = ["wgpu"]}
20-
grin-gui-widgets = { version = "0.1.0-alpha.5", path = "crates/widgets" }
19+
grin-gui-core = { version = "0.1.0-alpha.6", path = "crates/core", features = ["wgpu"]}
20+
grin-gui-widgets = { version = "0.1.0-alpha.6", path = "crates/widgets" }
2121

2222
iced = { version = "0.10", features = ["canvas", "tokio"] }
2323
iced_futures = { version = "0.7", features = ["async-std"] }

crates/core/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
[package]
22
name = "grin-gui-core"
33
description = "Core GUI library for Grin GUI"
4-
version = "0.1.0-alpha.5"
4+
version = "0.1.0-alpha.6"
55
authors = ["Yeastplume", "Casper Rogild Storm"]
66
license = "GPL-3.0"
77
homepage = "https://github.com/mimblewimble/grin-gui"

0 commit comments

Comments
 (0)