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
..
app	Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba	2016-02-16 11:32:14 -05:00
chain	Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba	2016-02-16 11:32:14 -05:00
db	Merge branches '492-bugfix-close-logic', '550-cleanup-remove-evaluation-observer' and '581-cleanup-object-operators' into develop	2016-02-15 16:01:27 -05:00
deterministic_openssl_rand	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
egenesis	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
fc@8eec508b8c	Updated fc submodule version (fixes compile) #500	2016-02-09 07:24:24 -06:00
net	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
p2p	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
plugins	Merge branch graphene/develop into bitshares at commit 'f1b19b15'	2016-02-16 11:04:31 -05:00
time	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
utilities	[License] Modify cpp and hpp headers to MIT #496	2016-01-07 11:44:52 -05:00
wallet	Merge remote-tracking branch 'graphene/develop' into bitshares at commit 1153d77dba	2016-02-16 11:32:14 -05:00
CMakeLists.txt	Remove experimental p2p code #273	2015-08-26 17:51:55 -04:00