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

Jump to bottom

merge changes from monero: device/trezor (PR #4241, PR #4809) #63

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

merge changes from monero: device/trezor (PR #4241, PR #4809) #63

wants to merge 2 commits into from

Conversation

bleepster
Copy link
Contributor

@bleepster bleepster commented Oct 21, 2019 •
edited
Loading

Merging the following commits:

  • device/trezor: trezor support added (29ffb6b) PR #4241
  • Fix build of monero-gui by adding device_trezor to wallet_merged (1fd017c) PR #4809

See commit message for details.

ph4r05 and others added 2 commits November 3, 2019 13:19
@ph4r05 @bleepster
device/trezor: trezor support added
029cef4 
----
From: Merge pull request #4241
Commit Hash: 29ffb6b

Conflicts:
    .gitmodules
    src/device/device.hpp
Resolve:
    prefer incoming changes
@buricl @bleepster
Fix build of monero-gui by adding device_trezor to wallet_merged
c86b2a3 
----
From: Merge pull request #4809
Commit Hash: 1fd017c
@bleepster bleepster force-pushed the monero-merge-2019.10.06-device_trezor branch from 722db59 to c86b2a3 Compare November 3, 2019 05:23
@bleepster bleepster changed the title merge changes from monero: device/trezor (PR #4241) merge changes from monero: device/trezor (PR #4241, PR #4809) Nov 3, 2019
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@bleepster @ph4r05 @buricl