diff options
| author | chriseth <chris@ethereum.org> | 2017-03-16 00:26:06 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-16 00:26:06 +0800 |
| commit | 59099908c53129b2f5723bd0d5283c4da089e398 (patch) | |
| tree | 13ef1dea012c7f093122d5e7578dc3c893636e59 | |
| parent | 39964f574e25bd9c4092e4404dc5b48551f702b5 (diff) | |
| parent | 364da425d3116a4b85863df39a1864340861d71e (diff) | |
| download | dexon-solidity-59099908c53129b2f5723bd0d5283c4da089e398.tar.gz dexon-solidity-59099908c53129b2f5723bd0d5283c4da089e398.tar.zst dexon-solidity-59099908c53129b2f5723bd0d5283c4da089e398.zip | |
Merge branch 'release' into develop
| -rw-r--r-- | prerelease.txt | 0 | ||||
| -rw-r--r-- | scripts/Dockerfile | 2 |
2 files changed, 1 insertions, 1 deletions
diff --git a/prerelease.txt b/prerelease.txt new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/prerelease.txt diff --git a/scripts/Dockerfile b/scripts/Dockerfile index 8be19783..ad448fd3 100644 --- a/scripts/Dockerfile +++ b/scripts/Dockerfile @@ -13,4 +13,4 @@ cmake -DCMAKE_BUILD_TYPE=Release -DTESTS=0 -DSTATIC_LINKING=1 &&\ make solc && install -s solc/solc /usr/bin &&\ cd / && rm -rf solidity &&\ apk del sed build-base git make cmake gcc g++ musl-dev curl-dev boost-dev &&\ -rm -rf /var/cache/apk/*
\ No newline at end of file +rm -rf /var/cache/apk/* |