commit 55ba877738578e16269ce3517db5deb2a596083e Merge: b6c8f29 2fa11cb Author: Georg Koppen <gk@torproject.org> Date: Thu Aug 28 10:35:30 2014 +0000 Merge remote-tracking branch 'pc/bug4234-04' gitian/Makefile | 1 + gitian/descriptors/linux/gitian-bundle.yml | 31 ++++++++++++++++++---- gitian/descriptors/linux/gitian-firefox.yml | 13 ++++++++- gitian/descriptors/mac/gitian-bundle.yml | 35 ++++++++++++++++++++----- gitian/descriptors/mac/gitian-firefox.yml | 16 +++++++++-- gitian/descriptors/windows/gitian-bundle.yml | 35 +++++++++++++++++++++---- gitian/descriptors/windows/gitian-firefox.yml | 16 +++++++++-- gitian/mkbundle-linux.sh | 4 ++- gitian/mkbundle-mac.sh | 4 +-- gitian/mkbundle-windows.sh | 3 ++- gitian/versions | 2 ++ gitian/versions.alpha | 2 ++ gitian/versions.beta | 2 ++ gitian/versions.nightly | 2 ++ 14 files changed, 140 insertions(+), 26 deletions(-)