diff options
author | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
---|---|---|
committer | Alexandre Van de Sande <alex.vandesande@ethdev.com> | 2015-02-23 20:05:15 +0800 |
commit | dea65840186fe861017524c9cb59ae07ac97ed06 (patch) | |
tree | 5cb5e339b9ce77a2a3c92cf8a10c4294fcf7965c /README.md | |
parent | bb3338df6363d8267a24190584f0908463241a6c (diff) | |
parent | dd086791acf477da7641c168f82de70ed0b2dca6 (diff) | |
download | dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.gz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.bz2 dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.lz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.xz dexon-dea65840186fe861017524c9cb59ae07ac97ed06.tar.zst dexon-dea65840186fe861017524c9cb59ae07ac97ed06.zip |
Merge branch 'develop' into ui
Diffstat (limited to 'README.md')
-rw-r--r-- | README.md | 8 |
1 files changed, 4 insertions, 4 deletions
@@ -2,10 +2,10 @@ Ethereum Go Client © 2014 Jeffrey Wilcke. - | Linux | OSX | Windows -----------|---------|-----|-------- -develop | [](http://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [](http://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | N/A -master | [](http://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [](http://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | N/A + | Linux | OSX | Windows | Tests +----------|---------|-----|---------|------ +develop | [](https://build.ethdev.com/builders/Linux%20Go%20develop%20branch/builds/-1) | [](https://build.ethdev.com/builders/OSX%20Go%20develop%20branch/builds/-1) | N/A | [](https://travis-ci.org/ethereum/go-ethereum) +master | [](https://build.ethdev.com/builders/Linux%20Go%20master%20branch/builds/-1) | [](https://build.ethdev.com/builders/OSX%20Go%20master%20branch/builds/-1) | N/A | [](https://travis-ci.org/ethereum/go-ethereum) [](https://waffle.io/ethereum/go-ethereum) [](https://waffle.io/ethereum/go-ethereum) |