Commit graph

5 commits

Author SHA1 Message Date
dnotestein
404cf8ae5c Merge branch 'phoenix' of https://github.com/InvictusInnovations/fc into phoenix
Conflicts:
	CMakeLists.txt
	include/fc/ptr.hpp
2013-08-11 09:59:55 -04:00
Daniel Larimer
7b8494d7f8 upgrading to a version of boost that includes boost::atomic and boost::context 2013-08-08 21:31:35 -04:00
Daniel Larimer
f5f3bb5102 error cleanup, log cleanup, bug fixes 2013-07-18 22:19:19 -04:00
Daniel Larimer
b07aed4a22 Update use of fc::string and fc::vector. 2013-06-27 14:19:08 -04:00
Daniel Larimer
59a121d64b Updating FC with changes from phoenix-int 2013-06-05 15:19:00 -04:00