Commit Graph

5 Commits

Author SHA1 Message Date
Preston Van Loon
0cc6a006c1 merge upstream
Former-commit-id: b1699eddfbe71837d0703c6c998624bdcffeee55 [formerly 324fd14865ea1bddc19d776718d1d8e1cf3ee210]
Former-commit-id: 2523cca14cf81b44d7fe05a121524e38f9ecc77d
2018-02-18 21:03:41 -05:00
Preston Van Loon
84ff4c5b14 Merge pull request #23 from ethereum/master
Upstream changes from ethereum/go-ethereum

Former-commit-id: b40212f60d4e0a11e783a362886c7db8fb9c54f9 [formerly a2112a830d4047afa18c31243c2a506f80d4de12]
Former-commit-id: 4c9a4d5662038dd26bda5d3343f231795c702b02
2018-02-07 10:27:01 -05:00
Raul Jordan
da20785685 Merge branch 'master' into gitter-badge-1
Former-commit-id: 23f542f43b4b493e38f5aa4c29788ed93a63b43b [formerly 71b23a6a28eb045fcfeab6329de69f1e5455486b]
Former-commit-id: d12b3a6decc876f010a71f98e11df7387c1aaf2a
2018-01-13 17:31:28 -05:00
The Gitter Badger
f0d28b9a86 Add Gitter badge
Former-commit-id: 149baffe14f39f06a11819bad8cb5f8c39eb7219 [formerly 8af027a6cf4200c6f9eff6ebe309842699b1f896]
Former-commit-id: 7b136b3c018049f368d8d3ce437e56d4ca8623d7
2018-01-11 21:42:34 +00:00
Fynn
8bf9cd853f FreeBSD support
Former-commit-id: ff5dba816571945e8c0837f3ef52485da5fd7314 [formerly 2f23f618fd8f01331b593ab4e064138047fe7c77]
Former-commit-id: 1ec5e7440481e307be5e131ac0a416fd7d2fea9f
2015-07-28 19:16:16 -03:00