[python-mapnik] 02/05: Merge tag 'upstream/0.0_20160830-541fd96'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository python-mapnik.

commit 458df859e016e8414ac59486d05a5217279e9fdc
Merge: 9e4d11f 9f3a854
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Sep 8 15:49:47 2016 +0200

    Merge tag 'upstream/0.0_20160830-541fd96'
    
    Upstream version 0.0~20160830-541fd96

 bootstrap.sh                                       |  50 +++++++++++++--------
 scripts/setup_mason.sh                             |   2 +-
 .../images/style-image-filter/agg-stack-blur22.png | Bin 33700 -> 33686 bytes
 .../images/style-image-filter/blur.png             | Bin 27212 -> 27207 bytes
 .../images/style-image-filter/edge-detect.png      | Bin 22467 -> 22471 bytes
 .../images/style-image-filter/emboss.png           | Bin 24564 -> 24552 bytes
 .../images/style-image-filter/gray.png             | Bin 23594 -> 23599 bytes
 .../images/style-image-filter/invert.png           | Bin 24135 -> 24136 bytes
 .../images/style-image-filter/none.png             | Bin 24072 -> 24079 bytes
 .../images/style-image-filter/sharpen.png          | Bin 22765 -> 22760 bytes
 .../images/style-image-filter/sobel.png            | Bin 23934 -> 23955 bytes
 .../images/style-image-filter/x-gradient.png       | Bin 27052 -> 27060 bytes
 .../images/style-image-filter/y-gradient.png       | Bin 27276 -> 27268 bytes
 .../encoding-opts/aerial_rgba-webp+method=0.webp   | Bin 11778 -> 11780 bytes
 .../encoding-opts/aerial_rgba-webp+method=6.webp   | Bin 10010 -> 9892 bytes
 .../blank-webp+alpha_filtering=2.webp              | Bin 224 -> 224 bytes
 .../encoding-opts/blank-webp+alpha_quality=50.webp | Bin 224 -> 224 bytes
 .../encoding-opts/blank-webp+autofilter=0.webp     | Bin 224 -> 224 bytes
 .../blank-webp+filter_sharpness=4.webp             | Bin 224 -> 224 bytes
 .../blank-webp+filter_strength=50.webp             | Bin 224 -> 224 bytes
 .../blank-webp+filter_type=1+autofilter=1.webp     | Bin 220 -> 220 bytes
 .../support/encoding-opts/blank-webp+method=0.webp | Bin 282 -> 282 bytes
 .../support/encoding-opts/blank-webp+method=6.webp | Bin 240 -> 240 bytes
 .../blank-webp+partition_limit=50.webp             | Bin 224 -> 224 bytes
 .../encoding-opts/blank-webp+partitions=3.webp     | Bin 224 -> 224 bytes
 .../support/encoding-opts/blank-webp+pass=10.webp  | Bin 224 -> 224 bytes
 .../encoding-opts/blank-webp+preprocessing=1.webp  | Bin 224 -> 224 bytes
 .../encoding-opts/blank-webp+quality=64.webp       | Bin 222 -> 222 bytes
 .../encoding-opts/blank-webp+segments=3.webp       | Bin 222 -> 222 bytes
 .../encoding-opts/blank-webp+sns_strength=50.webp  | Bin 224 -> 224 bytes
 .../encoding-opts/blank-webp+target_PSNR=.5.webp   | Bin 224 -> 224 bytes
 .../encoding-opts/blank-webp+target_size=100.webp  | Bin 224 -> 224 bytes
 .../images/support/encoding-opts/blank-webp.webp   | Bin 224 -> 224 bytes
 .../support/encoding-opts/solid-webp+method=6.webp | Bin 216 -> 222 bytes
 .../support/marker-text-line-scale-factor-0.1.png  | Bin 3851 -> 3845 bytes
 .../marker-text-line-scale-factor-0.899.png        | Bin 17229 -> 17232 bytes
 .../support/marker-text-line-scale-factor-1.5.png  | Bin 11502 -> 11508 bytes
 .../support/marker-text-line-scale-factor-1.png    | Bin 18310 -> 18310 bytes
 .../support/marker-text-line-scale-factor-10.png   | Bin 8348 -> 8369 bytes
 .../marker-text-line-scale-factor-1e-05.png        | Bin 1637 -> 1638 bytes
 .../support/marker-text-line-scale-factor-2.png    | Bin 11823 -> 11838 bytes
 .../support/marker-text-line-scale-factor-5.png    | Bin 13987 -> 13978 bytes
 .../images/support/transparency/white0.webp        | Bin 738 -> 318 bytes
 43 files changed, 32 insertions(+), 20 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/python-mapnik.git