Skip to content

Commit

Permalink
Merge branch 'master' into develop
Browse files Browse the repository at this point in the history
  • Loading branch information
Jimmy Hartzell committed Aug 31, 2018
2 parents a0f55da + f66f81c commit 385f30c
Showing 1 changed file with 2 additions and 2 deletions.
4 changes: 2 additions & 2 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -21,9 +21,9 @@ endif
include $(BOLOS_SDK)/Makefile.defines

ifeq ($(BAKING_APP),Y)
APPNAME = "TezBake"
APPNAME = "Tezos Baking"
else
APPNAME = "Tezos"
APPNAME = "Tezos Wallet"
endif
APP_LOAD_PARAMS=--appFlags 0 --curve ed25519 --curve secp256k1 --curve prime256r1 --path "44'/1729'" $(COMMON_LOAD_PARAMS)
APPVERSION_M=0
Expand Down

0 comments on commit 385f30c

Please sign in to comment.