diff options
author | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-07 18:57:11 +0200 |
---|---|---|
committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2011-09-07 18:57:11 +0200 |
commit | a0d2f9a12dad7b33a3f12d85dee8afa4155dbc99 (patch) | |
tree | 24a475fe47ed00837fbed1836d03d933cfe7dbb2 /contrib/wxwidgets.yml | |
parent | f077d1ad62cba26b2620c87abba87be7fec15f0d (diff) | |
parent | f92f022edaa2f14951b9ce8304a304ff9693ae16 (diff) | |
download | bitcoin-a0d2f9a12dad7b33a3f12d85dee8afa4155dbc99.tar.xz |
Merge branch 'master' of https://github.com/bitcoin/bitcoin
Conflicts:
.gitignore
Diffstat (limited to 'contrib/wxwidgets.yml')
-rw-r--r-- | contrib/wxwidgets.yml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/wxwidgets.yml b/contrib/wxwidgets.yml index a2406936d3..0509615101 100644 --- a/contrib/wxwidgets.yml +++ b/contrib/wxwidgets.yml @@ -38,5 +38,5 @@ script: | cd $TMPDIR export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1 export FAKETIME=$REFERENCE_DATETIME - zip -r wxWidgets-2.9.2-gitian.zip * - cp wxWidgets-2.9.2-gitian.zip $OUTDIR + zip -r wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip * + cp wxWidgets-2.9.2-x$GBUILD_BITS-gitian.zip $OUTDIR |