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
..
include/graphene/app	confidential_object.hpp: Move confidential objects into own header #466	2016-01-08 13:06:14 -05:00
api.cpp	Merge branch graphene/develop into bitshares at commit 'f1b19b15'	2016-02-16 11:04:31 -05:00
application.cpp	Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba	2016-02-16 11:32:14 -05:00
CMakeLists.txt	Win32 compile fixes	2015-09-14 16:05:32 -04:00
database_api.cpp	Clean up some non-determisitic behavior, maybe fix #485	2016-02-11 13:02:11 -05:00
impacted.cpp	Implement FBA fee routing for STEALTH #563	2016-02-15 15:33:21 -05:00
plugin.cpp	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00