[Pkg-mozext-commits] [adblock-plus] 18/22: 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 9d660918754478d9a3ba1d848ba628c28040137d
Merge: 0f0133b b58d013
Author: David Prévot <taffit at debian.org>
Date:   Wed Apr 1 14:06:59 2015 -0400

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

 buildtools/build.py           | 36 ++++++++++++------------------------
 buildtools/dependencies       |  2 +-
 buildtools/manifest.json.tmpl |  6 ++++++
 buildtools/packagerChrome.py  |  1 +
 4 files changed, 20 insertions(+), 25 deletions(-)


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