[Pkg-mozext-commits] [adblock-plus] 38/41: Merge branch 'master' of https://github.com/adblockplus/buildtools

[David Prévot]

This is an automated email from the git hooks/post-receive script.

taffit pushed a commit to branch master
in repository adblock-plus.

commit 877b2abec76d82831c7b69393ca4caf2aa222e59
Merge: beb4e1f 442a3bd
Author: David Prévot <taffit at debian.org>
Date:   Wed Mar 18 13:44:04 2015 -0400

    Merge branch 'master' of https://github.com/adblockplus/buildtools

 buildtools/.hgignore            |  1 +
 buildtools/build.py             | 27 ++++++++------
 buildtools/imageCompression.py  | 82 +++++++++++++++++++++++++++++++++++++++++
 buildtools/imageConversion.py   | 79 ++++++++++++++++-----------------------
 buildtools/packager.py          |  4 +-
 buildtools/packagerChrome.py    |  2 +-
 buildtools/packagerGecko.py     |  2 +-
 buildtools/packagerSafari.py    |  2 +-
 buildtools/releaseAutomation.py | 10 ++---
 9 files changed, 141 insertions(+), 68 deletions(-)

diff --cc buildtools/imageCompression.py
index 0000000,6ffe46a..6ffe46a
mode 000000,100644..100644
--- a/buildtools/imageCompression.py
+++ b/buildtools/imageCompression.py

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/adblock-plus.git