Ilya Kitaev a4390dae07 resolved conflict with 'develop' of https://github.com/mbg033/monero		2016-10-07 00:36:36 +03:00
..
api	resolved conflict with 'develop' of https://github.com/mbg033/monero	2016-10-07 00:36:36 +03:00
CMakeLists.txt	Dropped "bit" from bitmonero.	2016-09-26 17:22:30 -04:00
wallet2_api.h	libwallet_api: do not signal on sent/received tx until wallet completely	2016-10-07 00:29:13 +03:00
wallet2.cpp	Merge pull request #1173	2016-10-04 12:15:02 +02:00
wallet2.h	Merge pull request #1173	2016-10-04 12:15:02 +02:00
wallet_errors.h	wallet: change priority/fee to ArticMine's recommendation	2016-09-16 11:50:52 +01:00
wallet_rpc_server_commands_defs.h	wallet: change priority/fee to ArticMine's recommendation	2016-09-16 11:50:52 +01:00
wallet_rpc_server_error_codes.h	wallet: new {ex,im}port_key_images commands and RPC calls	2016-07-24 09:23:30 +01:00
wallet_rpc_server.cpp	epee: optionally restrict HTTP service to a configurable user agent	2016-09-18 20:32:02 +01:00
wallet_rpc_server.h	epee: optionally restrict HTTP service to a configurable user agent	2016-09-18 20:32:02 +01:00