paybee 133019cfc5 fixed conflict

2014-06-02 22:43:11 +02:00

..

wallet2.cpp

Added 'payment_id' optional argument to 'transfer' wallet RPC method

2014-06-02 00:22:42 +02:00

wallet2.h

Added 'payment_id' optional argument to 'transfer' wallet RPC method

2014-06-02 00:22:42 +02:00

wallet_errors.h

initial [broken] update

2014-05-03 12:19:43 -04:00

wallet_rpc_server_commans_defs.h

fixed conflict

2014-06-02 22:43:11 +02:00

wallet_rpc_server_error_codes.h

Added incoming_transfers RPC API method

2014-06-02 22:36:35 +02:00

wallet_rpc_server.cpp

fixed conflict

2014-06-02 22:43:11 +02:00

wallet_rpc_server.h

fixed conflict

2014-06-02 22:43:11 +02:00