Skip to content

Commit

Permalink
Merge pull request #281 from LedgerHQ/develop
Browse files Browse the repository at this point in the history
merge develop into master (B2CA-1560)
  • Loading branch information
tdejoigny-ledger authored Jul 18, 2024
2 parents 3f0e2ac + 9fd2223 commit c9c57cb
Show file tree
Hide file tree
Showing 155 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
# Application version
APPVERSION_M = 2
APPVERSION_N = 4
APPVERSION_P = 5
APPVERSION_P = 6

APPDEVELOPPER="Ledger"
APPCOPYRIGHT="(c) 2024 Ledger"
Expand Down
Binary file removed glyphs/dash_64px.gif
Binary file not shown.
Binary file added glyphs/dash_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/digibyte_64px.gif
Binary file not shown.
Binary file added glyphs/digibyte_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/dogecoin_64px.gif
Binary file not shown.
Binary file added glyphs/dogecoin_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/firo_64px.gif
Binary file not shown.
Binary file added glyphs/firo_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/gamecredits_64px.gif
Binary file not shown.
Binary file added glyphs/gamecredits_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/horizen_64px.gif
Binary file not shown.
Binary file added glyphs/horizen_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/hydra_64px.gif
Binary file not shown.
Binary file added glyphs/hydra_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/hydra_testnet_64px.gif
Binary file not shown.
Binary file added glyphs/hydra_testnet_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/komodo_64px.gif
Binary file not shown.
Binary file added glyphs/komodo_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/lbry_64px.gif
Binary file not shown.
Binary file added glyphs/lbry_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/litecoin_64px.gif
Binary file not shown.
Binary file added glyphs/litecoin_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/nix_64px.gif
Binary file not shown.
Binary file added glyphs/nix_64px.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed glyphs/peercoin_64px.gif
Binary file not shown.
Binary file added glyphs/peercoin_64px.png
Binary file removed glyphs/pivx_64px.gif
Diff not rendered.
Binary file added glyphs/pivx_64px.png
Binary file removed glyphs/ravencoin_64px.gif
Diff not rendered.
Binary file added glyphs/ravencoin_64px.png
Binary file removed glyphs/resistance_64px.gif
Diff not rendered.
Binary file removed glyphs/stealth_64px.gif
Diff not rendered.
Binary file added glyphs/stealth_64px.png
Binary file removed glyphs/stratis_64px.gif
Diff not rendered.
Binary file added glyphs/stratis_64px.png
Binary file removed glyphs/vertcoin_64px.gif
Diff not rendered.
Binary file added glyphs/vertcoin_64px.png
Binary file removed glyphs/viacoin_64px.gif
Diff not rendered.
Binary file added glyphs/viacoin_64px.png
Binary file removed glyphs/xrhodium_64px.gif
Diff not rendered.
Binary file added glyphs/xrhodium_64px.png
Binary file removed glyphs/xsn_64px.gif
Diff not rendered.
Binary file added glyphs/xsn_64px.png
Binary file removed glyphs/zcash.gif
Diff not rendered.
Binary file removed glyphs/zcash_64px.gif
Diff not rendered.
Binary file added glyphs/zcash_64px.png
Binary file removed glyphs/zclassic_64px.gif
Diff not rendered.
Binary file added glyphs/zclassic_64px.png
Binary file removed icons/qtum.png
Diff not rendered.
Binary file removed icons/resistance.png
Diff not rendered.
Binary file removed icons/stax_app_bitcoin.gif
Diff not rendered.
Binary file added icons/stax_app_bitcoin.png
Binary file removed icons/stax_app_bitcoin_cash.gif
Diff not rendered.
Binary file added icons/stax_app_bitcoin_cash.png
Binary file removed icons/stax_app_bitcoin_gold.gif
Diff not rendered.
Binary file added icons/stax_app_bitcoin_gold.png
Binary file removed icons/stax_app_bitcoin_legacy.gif
Diff not rendered.
Binary file added icons/stax_app_bitcoin_legacy.png
Binary file removed icons/stax_app_bitcoin_private.gif
Diff not rendered.
Binary file added icons/stax_app_bitcoin_private.png
Binary file removed icons/stax_app_bitcoin_testnet.gif
Diff not rendered.
Binary file added icons/stax_app_bitcoin_testnet.png
Binary file removed icons/stax_app_bitcoin_testnet_legacy.gif
Diff not rendered.
Binary file added icons/stax_app_bitcoin_testnet_legacy.png
Binary file removed icons/stax_app_dash.gif
Diff not rendered.
Binary file added icons/stax_app_dash.png
Binary file removed icons/stax_app_digibyte.gif
Diff not rendered.
Binary file added icons/stax_app_digibyte.png
Binary file removed icons/stax_app_dogecoin.gif
Diff not rendered.
Binary file added icons/stax_app_dogecoin.png
Binary file removed icons/stax_app_firo.gif
Diff not rendered.
Binary file added icons/stax_app_firo.png
Binary file removed icons/stax_app_gamecredits.gif
Diff not rendered.
Binary file added icons/stax_app_gamecredits.png
Binary file removed icons/stax_app_horizen.gif
Diff not rendered.
Binary file added icons/stax_app_horizen.png
Binary file removed icons/stax_app_hydra.gif
Diff not rendered.
Binary file added icons/stax_app_hydra.png
Binary file removed icons/stax_app_hydra_testnet.gif
Diff not rendered.
Binary file added icons/stax_app_hydra_testnet.png
Binary file removed icons/stax_app_komodo.gif
Diff not rendered.
Binary file added icons/stax_app_komodo.png
Binary file removed icons/stax_app_lbry.gif
Diff not rendered.
Binary file added icons/stax_app_lbry.png
Binary file removed icons/stax_app_litecoin.gif
Diff not rendered.
Binary file added icons/stax_app_litecoin.png
Binary file removed icons/stax_app_nix.gif
Diff not rendered.
Binary file added icons/stax_app_nix.png
Binary file removed icons/stax_app_peercoin.gif
Diff not rendered.
Binary file added icons/stax_app_peercoin.png
Binary file removed icons/stax_app_pivx.gif
Diff not rendered.
Binary file added icons/stax_app_pivx.png
Binary file removed icons/stax_app_qtum.gif
Diff not rendered.
Binary file removed icons/stax_app_ravencoin.gif
Diff not rendered.
Binary file added icons/stax_app_ravencoin.png
Binary file removed icons/stax_app_resistance.gif
Diff not rendered.
Binary file removed icons/stax_app_stratis.gif
Diff not rendered.
Binary file added icons/stax_app_stratis.png
Binary file removed icons/stax_app_vertcoin.gif
Diff not rendered.
Binary file added icons/stax_app_vertcoin.png
Binary file removed icons/stax_app_viacoin.gif
Diff not rendered.
Binary file added icons/stax_app_viacoin.png
Binary file removed icons/stax_app_xrhodium.gif
Diff not rendered.
Binary file added icons/stax_app_xrhodium.png
Binary file removed icons/stax_app_zcash.gif
Diff not rendered.
Binary file added icons/stax_app_zcash.png
Binary file removed icons/stax_app_zclassic.gif
Diff not rendered.
Binary file added icons/stax_app_zclassic.png
2 changes: 1 addition & 1 deletion lib-app-bitcoin
Submodule lib-app-bitcoin updated 1 files
+1 −1 Makefile
Binary file modified tests/snapshots/flex/test_get_public_key_m/44'/1'/0'_0_1/00000.png
Binary file modified tests/snapshots/flex/test_get_public_key_m/44'/1'/0'_0_1/00001.png
Binary file modified tests/snapshots/flex/test_get_public_key_m/44'/1'/0'_0_1/00002.png
Binary file modified tests/snapshots/flex/test_get_public_key_m/44'/1'/10'_0_1/00000.png
Binary file modified tests/snapshots/flex/test_get_public_key_m/44'/1'/10'_0_1/00002.png
Binary file modified tests/snapshots/flex/test_sign_message_0_0/00000.png
Binary file modified tests/snapshots/flex/test_sign_message_0_0/00001.png
Binary file modified tests/snapshots/flex/test_sign_message_1_0/00000.png
Binary file modified tests/snapshots/flex/test_sign_message_1_0/00001.png
Binary file modified tests/snapshots/flex/test_sign_message_1_0/00002.png

0 comments on commit c9c57cb

Please sign in to comment.