Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

develop <-- main #514

Merged
merged 6 commits into from
Jun 4, 2024
+4 −4
Merged

develop <-- main #514

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
83eadb9
Merge pull request #510 from Cypherock/release/v0.6.512+
ParnikaGupta9 Jun 1, 2024
5da52d7
fix(app): Btc derv app version fix
vrockz747 Jun 4, 2024
33cb084
Merge pull request #512 from Cypherock/hotfix/btc-derivatives-verison
ParnikaGupta9 Jun 4, 2024
50c5c19
chore: Version bump
VeronicaGupta Jun 4, 2024
164631d
Merge branch 'main' into hotfix/btc-derivatives-verison
ParnikaGupta9 Jun 4, 2024
38f2eff
Merge pull request #513 from Cypherock/hotfix/btc-derivatives-verison
ParnikaGupta9 Jun 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion apps/btc_family/dash/dash_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ static const cy_app_desc_t dash_app_desc = {.id = 6,
.version =
{
.major = 1,
.minor = 0,
.minor = 1,
.patch = 0,
},
.app = btc_main,
Expand Down
2 changes: 1 addition & 1 deletion apps/btc_family/doge/doge_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static const cy_app_desc_t doge_app_desc = {.id = 5,
.version =
{
.major = 1,
.minor = 0,
.minor = 1,
.patch = 0,
},
.app = btc_main,
Expand Down
2 changes: 1 addition & 1 deletion apps/btc_family/ltc/ltc_app.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -123,7 +123,7 @@ static const cy_app_desc_t ltc_app_desc = {.id = 4,
.version =
{
.major = 1,
.minor = 0,
.minor = 1,
.patch = 0,
},
.app = btc_main,
Expand Down
2 changes: 1 addition & 1 deletion version.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
firmware version=000:006:002:000
firmware version=000:006:002:001
hardware version=000:001:000:000
magic number=45227A01
Loading