diff options
| author | obscuren <geffobscura@gmail.com> | 2015-03-15 19:20:58 +0800 |
|---|---|---|
| committer | obscuren <geffobscura@gmail.com> | 2015-03-15 19:20:58 +0800 |
| commit | c87cc59bdf0e54318f1d4f013d9d6931422053e3 (patch) | |
| tree | e07d716fed4974a14bba5f78297da3f911dcc393 | |
| parent | 8f84ddbbec307da961e8e3ee51749ab62424fa82 (diff) | |
| parent | 0f26a623349e7b01298d121e058ccbf067c4906a (diff) | |
| download | dexon-c87cc59bdf0e54318f1d4f013d9d6931422053e3.tar dexon-c87cc59bdf0e54318f1d4f013d9d6931422053e3.tar.gz dexon-c87cc59bdf0e54318f1d4f013d9d6931422053e3.tar.bz2 dexon-c87cc59bdf0e54318f1d4f013d9d6931422053e3.tar.lz dexon-c87cc59bdf0e54318f1d4f013d9d6931422053e3.tar.xz dexon-c87cc59bdf0e54318f1d4f013d9d6931422053e3.tar.zst dexon-c87cc59bdf0e54318f1d4f013d9d6931422053e3.zip | |
Merge branch 'develop' of github.com-obscure:ethereum/go-ethereum into develop
Conflicts:
README.md
| -rw-r--r-- | README.md | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -50,7 +50,7 @@ Automated (dev) builds * [Docker](https://registry.hub.docker.com/u/ethereum/client-go/) * [OS X](http://build.ethdev.com/builds/OSX%20Go%20develop%20branch/Mist-OSX-latest.dmg) * Ubuntu - [Trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/ethereum-cli_0.9.0%2B192SNAPSHOT20150314224122trusty-0ubuntu1_i386.deb) | + [trusty](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-trusty/latest/ethereum-cli_0.9.0%2B192SNAPSHOT20150314224122trusty-0ubuntu1_i386.deb) | [utopic](https://build.ethdev.com/builds/Linux%20Go%20develop%20deb%20i386-utopic/latest/ethereum-cli_0.9.0%2B194SNAPSHOT20150314224124utopic-0ubuntu1_i386.deb) * [Windows] Coming soon™ |