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

Fix build errors #2656

Merged
merged 2 commits into from
Oct 15, 2017
Merged

Fix build errors #2656

merged 2 commits into from
Oct 15, 2017

Conversation

Jaqueeee
Copy link
Contributor

No description provided.

fluffypony
fluffypony approved these changes Oct 15, 2017
View reviewed changes
Copy link
Contributor

@fluffypony fluffypony left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed

fluffypony
fluffypony approved these changes Oct 15, 2017
View reviewed changes
Copy link
Contributor

@fluffypony fluffypony left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed

@fluffypony fluffypony mentioned this pull request Oct 15, 2017
Closed
@fluffypony fluffypony merged commit 3492de0 into monero-project:master Oct 15, 2017
fluffypony added a commit that referenced this pull request Oct 15, 2017
@fluffypony
Merge pull request #2656
97c11ca 
3492de0 fix lightwallet and subaddresses conflict (Jaquee)
329f149 remove reference to cryptonote::null_hash (Jaquee)
@fluffypony
Copy link
Contributor 

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Something went wrong with GPG, so this merge wasn't signed. My bad.
-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEElLc43TUBMvWsvuodVUMt8xzNT80FAlnjuBAACgkQVUMt8xzN
T810NAf/etoHdEDXmJbH5xgdfzIW9vEbMS3zRiLubVmxE/KQE4B8Gn6ByZGm/Ns+
g7yQ4/SdL/HIYQFOyLFmv4+JdMV8J7Y6gn3QdwbfK8pJAIf4rAPHNMJwDdrM+U9e
4uOljFwGiCZMeWd/ZFg8yB5RjeA5zov5spUrrtLiZ+22+AVxPNn8cVdC+O2eMvtL
mFfkOGAO8M3L5vfV1aCXRwyBIt40kv2pje8VM4HN60c8simoZVY2lzqnAicj5df/
E0KzHZBy2X7LUlEa9eUMCqDAE5QVehKeSEQorwzVS0KiPZCD/6x7oXJ5EMPkkaCi
QXaiEUY3K1OrT5otndKt0gNNXjX6AA==
=tgGW
-----END PGP SIGNATURE-----

kenshi84 added a commit to kenshi84/monero that referenced this pull request Oct 16, 2017
@kenshi84
wallet2: workaround for lightwallet before supporting subaddress (fol…
ac4018a 
…lowup monero-project#2656)
moneromooo-monero pushed a commit to moneromooo-monero/bitmonero that referenced this pull request Oct 19, 2017
@kenshi84 @moneromooo-monero
wallet2: workaround for lightwallet before supporting subaddress (fol…
3138bf7 
…lowup monero-project#2656)
fluffypony added a commit that referenced this pull request Nov 14, 2017
@fluffypony
Merge pull request #2661
2ddb894 
ac4018a wallet2: workaround for lightwallet before supporting subaddress (followup #2656) (kenshi84)
TheCharlatan pushed a commit to TheCharlatan/monero that referenced this pull request Feb 4, 2018
@kenshi84 @TheCharlatan
wallet2: workaround for lightwallet before supporting subaddress (fol…
92f1195 
…lowup monero-project#2656)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fluffypony fluffypony fluffypony approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@Jaqueeee @fluffypony