365 Commits

Author	SHA1	Message	Date
Kevin Serrano	86f71d504c	Merge branch 'master' into i1144-moarrpc	2017-03-08 09:28:36 -08:00
Dan Finlay	1f0a4dd033	Bump changelog	2017-03-07 21:30:27 -08:00
Kevin Serrano	e66035254f	More conflict resolution.	2017-03-01 10:04:25 -08:00
Kevin Serrano	0a3849ec84	Fix merge conflicts.	2017-03-01 10:01:21 -08:00
Dan Finlay	865764dff5	Bump changelog	2017-02-28 15:46:26 -08:00
Dan Finlay	5edb3db969	Merge branch 'master' into i1144-moarrpc	2017-02-27 10:36:48 -08:00
Dan Finlay	c831043a51	Remove claim for ecRecover support	2017-02-27 10:16:16 -08:00
Dan Finlay	a35229e8d4	Bump changelog	2017-02-24 16:15:31 -08:00
Kevin Serrano	761eb49586	Changelog.	2017-02-22 15:13:29 -08:00
Dan Finlay	29f07238f4	Move changelog entry	2017-02-21 09:03:16 -08:00
Dan Finlay	04e80d36be	Version 3.3.0	2017-02-20 14:46:55 -08:00
Dan Finlay	42a58918d0	Add personal_sign and personal_ecRecover support	2017-02-20 11:46:43 -08:00
Kevin Serrano	c12bea5b2e	Merge branch 'master' into i1089-networkfront	2017-02-15 15:56:37 -08:00
Dan Finlay	352bb5cb39	Merge branch 'master' into dev	2017-02-15 15:49:04 -08:00
Kevin Serrano	3fe8e2b659	Merge branch 'master' into i1089-networkfront	2017-02-15 15:44:14 -08:00
Kevin Serrano	6a3b93b06e	Changelog.	2017-02-15 15:38:38 -08:00
Kevin Serrano	6ef78eb02b	Add to changelog.	2017-02-15 11:16:35 -08:00
Dan Finlay	0b0eec9c52	Bump changelog	2017-02-13 21:30:08 -08:00
kumavis	d1a6b8c8ed	Merge branch 'dev' into i1085-synchronousnet	2017-02-09 18:41:01 -08:00
Dan Finlay	26ae3d206f	Version 3.2.2	2017-02-09 18:21:11 -08:00
Frankie	26cd66cb62	Add to CHANGELOG	2017-02-09 17:34:05 -08:00
Kevin Serrano	4033b620bd	Allowed net_version to be called synchronously	2017-02-08 15:51:22 -08:00
Dan Finlay	5d827bece3	Version 3.2.1	2017-02-08 13:12:40 -08:00
Dan Finlay	480c7c5d24	Version 3.2.0	2017-02-07 16:11:30 -08:00
Frankie	e2e8a7cca0	Add to CHANGELOG	2017-02-01 11:55:26 -08:00
kumavis	70b8e640f0	Merge branch 'dev' into i#1048	2017-01-24 15:39:33 -08:00
kumavis	e2b2e6d5e1	3.1.2	2017-01-24 14:04:29 -08:00
Frankie	42bb90341d	add to CHANGELOG	2017-01-24 13:21:15 -08:00
Frankie	c587d0f7db	Merge branch 'master' into upToDate	2017-01-20 14:40:22 -08:00
kumavis	389a104f0d	3.1.1	2017-01-20 14:29:07 -08:00
Dan Finlay	b478ce5b77	Bump changelog	2017-01-18 17:24:41 -08:00
Dan Finlay	0e01abdf71	Merge branch 'master' into Version-3.1.0	2017-01-18 12:25:35 -08:00
Dan Finlay	99ce68b4f6	Version 3.1.0	2017-01-18 12:23:48 -08:00
kumavis	3273f507f7	Merge branch 'dev' into i715-AddImportMenu	2017-01-18 12:15:43 -08:00
Frankie	9e58505942	Add to CHANGELOG	2017-01-18 12:10:49 -08:00
Dan Finlay	81a16fb107	Bump changelog	2017-01-18 11:48:34 -08:00
Dan Finlay	8055113e68	Bump changelog	2017-01-17 16:35:57 -08:00
Dan Finlay	a208ed1d83	Version 3.0.1	2017-01-17 00:14:25 -08:00
Dan Finlay	665d6c5406	Bump changelog	2017-01-16 23:58:25 -08:00
Dan Finlay	9203b8c305	Version 3.0.0	2017-01-16 14:14:06 -08:00
Dan Finlay	ac6a2b4b61	Bump changelog to mention BIP44 fix	2017-01-16 10:59:01 -08:00
Dan Finlay	5dd5619e5d	Merge branch 'master' into dev	2017-01-16 10:55:32 -08:00
Frankie	83468cbd03	add to CHANGELOG	2017-01-14 23:12:53 -08:00
Frankie	bbd2f2738b	Add to CHANGELOG	2017-01-11 12:23:00 -08:00
kumavis	a9bdc76e40	changelog - add note on rpc overrides	2017-01-11 00:48:06 -08:00
Dan Finlay	55a55754d0	Bump changelog	2017-01-10 14:20:51 -08:00
Frankie	efde16aae5	add to CHANGELOG	2017-01-10 12:19:02 -08:00
Kevin Serrano	4e62ae98bd	Merge branch 'dev' into network-indicator-refactor	2017-01-05 12:51:12 -08:00
Dan Finlay	73ee0ae766	Merge branch 'dev' into fixTxManager	2017-01-05 11:18:13 -08:00
Kevin Serrano	b9a365a8f2	Changelog.	2017-01-04 15:08:39 -08:00