[Pkg-mozext-commits] [adblock-plus] 16/17: 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 81f18a1a0fdddf134b6fb92b4e82834559edf50f
Merge: af16e77 f469dec
Author: David Prévot <taffit at debian.org>
Date:   Mon Jun 8 16:07:13 2015 -0400

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

 buildtools/build.py               | 14 ++++++---
 buildtools/ensure_dependencies.py | 64 ++++++++++++++++++++++++++++++++-------
 buildtools/lib/prefs.js           | 32 ++++++++++++--------
 buildtools/packagerGecko.py       |  6 ++--
 4 files changed, 85 insertions(+), 31 deletions(-)


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