theoreticalbts 4f9bf7cc21 Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba ... Conflicts: libraries/chain/include/graphene/chain/config.hpp		2016-02-16 11:32:14 -05:00
..
api_documentation.hpp	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
reflect_util.hpp	Remove type_serializer, re-implement minimal functionality needed by cli_wallet #553	2016-02-12 00:10:52 -05:00
wallet.hpp	Merge branch graphene/develop into bitshares at commit 'f1b19b15'	2016-02-16 11:04:31 -05:00