diff options
| author | obscuren <geffobscura@gmail.com> | 2015-02-06 04:36:30 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-02-06 04:36:30 +0800 |
| commit | cad53fa1919ce2fd3e9cd02ad918e5808c379f74 (patch) | |
| tree | 8371ad94eb14f14e1962f1ebd10ff7ab9aa68a4b | |
| parent | 0e682d936da838ac2854b5fe04618cd84bc0cb13 (diff) | |
| parent | cec30e23b2ef44edeb308fc63f69f8f1fc2dc008 (diff) | |
| download | go-tangerine-cad53fa1919ce2fd3e9cd02ad918e5808c379f74.tar go-tangerine-cad53fa1919ce2fd3e9cd02ad918e5808c379f74.tar.gz go-tangerine-cad53fa1919ce2fd3e9cd02ad918e5808c379f74.tar.bz2 go-tangerine-cad53fa1919ce2fd3e9cd02ad918e5808c379f74.tar.lz go-tangerine-cad53fa1919ce2fd3e9cd02ad918e5808c379f74.tar.xz go-tangerine-cad53fa1919ce2fd3e9cd02ad918e5808c379f74.tar.zst go-tangerine-cad53fa1919ce2fd3e9cd02ad918e5808c379f74.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
README.md
| -rw-r--r-- | README.md | 3 |
1 files changed, 1 insertions, 2 deletions
@@ -1,5 +1,4 @@ -Ethereum Go -======== +## Ethereum Go Ethereum Go Client © 2014 Jeffrey Wilcke. |