Eric Frias 928b6934e0 Merge branch 'master' into p2p_sync_fixes ... Conflicts: libraries/chain/include/graphene/chain/database.hpp		2015-09-10 17:34:20 -04:00
..
include/graphene/app	wallet.cpp: Subscribe to block updates, fix #302	2015-09-10 15:56:08 -04:00
api.cpp	wallet.cpp: Subscribe to block updates, fix #302	2015-09-10 15:56:08 -04:00
application.cpp	Merge branch 'master' into p2p_sync_fixes	2015-09-10 17:34:20 -04:00
CMakeLists.txt	application.cpp: Use egenesis instead of create_example_genesis()	2015-08-07 16:45:53 -04:00
impacted.cpp	Implement committee_member_update operation #258	2015-08-26 17:42:50 -04:00
plugin.cpp	Progress on #144 - refactoring fee schedule	2015-07-08 18:45:53 -04:00