diff options
author | Riccardo Spagni <ric@spagni.net> | 2017-10-15 19:32:18 +0200 |
---|---|---|
committer | Riccardo Spagni <ric@spagni.net> | 2017-10-15 19:32:18 +0200 |
commit | 97c11caf0795e5edafa39a167a96f41b2a4fc38c (patch) | |
tree | 087221b619ee644eaece447b5c0d2bc97d35e3fc /Makefile | |
parent | Merge pull request #2640 (diff) | |
parent | fix lightwallet and subaddresses conflict (diff) | |
download | monero-97c11caf0795e5edafa39a167a96f41b2a4fc38c.tar.xz |
Merge pull request #2656
3492de01 fix lightwallet and subaddresses conflict (Jaquee)
329f149e remove reference to cryptonote::null_hash (Jaquee)
Diffstat (limited to 'Makefile')
0 files changed, 0 insertions, 0 deletions