Commit Graph

2 Commits

Author SHA1 Message Date
Gordon Hall
76247ff532 resolved merge conflicts 2014-04-19 12:13:24 -04:00
Gordon Hall
ba8542de62 add support for peer discovery to PeerManager and example of usage to examples/ 2014-04-19 11:33:26 -04:00