merged master

2018-10-26 10:22:03 -07:00
parent faf7225321 ef04b4b888
commit 0e8d8a83e0
11 changed files with 246 additions and 13 deletions
--- a/src/rpc.h
+++ b/src/rpc.h
@@ -21,6 +21,7 @@ struct TransactionItem {
    double          amount;
    unsigned long   confirmations;
    QString         fromAddr;
+    QString         memo;
 };

 class RPC