[openstreetmap-carto] 02/05: Merge tag 'upstream/2.35.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository openstreetmap-carto.

commit aabbb6653958c97018c95c29e949b2b5b6a3548d
Merge: a54f061 a5f120c
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Sep 18 00:57:48 2015 +0200

    Merge tag 'upstream/2.35.0'
    
    Upstream version 2.35.0

 amenity-points.mss                                 |  30 +++++++------
 landcover.mss                                      |   3 +-
 power.mss                                          |  14 ++++--
 project.mml                                        |  10 ++---
 project.yaml                                       |  18 ++++----
 scripts/shop_values.rb                             |   3 +-
 symbols/ford.16.svg                                |  14 ++++++
 symbols/generating_patterns/bare_ground.md         |   8 ++++
 symbols/generating_patterns/bog.svg                |   9 ++++
 symbols/generating_patterns/forest.md              |  11 +++++
 symbols/generating_patterns/forest.svg             |  11 +++++
 symbols/generating_patterns/mangrove.svg           |   9 ++++
 symbols/generating_patterns/marsh.svg              |   9 ++++
 symbols/generating_patterns/reed.svg               |   9 ++++
 symbols/generating_patterns/rock.svg               |   9 ++++
 symbols/generating_patterns/rock_overlay at 2x.png    | Bin 0 -> 366422 bytes
 symbols/generating_patterns/scree.svg              |   9 ++++
 symbols/generating_patterns/scree_overlay at 2x.png   | Bin 0 -> 193106 bytes
 symbols/generating_patterns/swamp.svg              |   9 ++++
 symbols/generating_patterns/wetland.md             |  16 +++++++
 symbols/generating_patterns/wetland.svg            |   9 ++++
 symbols/generating_patterns/wetland_bog at 2x.png     | Bin 0 -> 62283 bytes
 symbols/generating_patterns/wetland_generic at 2x.png | Bin 0 -> 2775 bytes
 .../generating_patterns/wetland_mangrove at 2x.png    | Bin 0 -> 87241 bytes
 symbols/generating_patterns/wetland_marsh at 2x.png   | Bin 0 -> 87828 bytes
 symbols/generating_patterns/wetland_reed at 2x.png    | Bin 0 -> 111331 bytes
 symbols/generating_patterns/wetland_swamp at 2x.png   | Bin 0 -> 75742 bytes
 symbols/nightclub.14.svg                           |  40 ++++++++++++++++++
 symbols/nightclub.18.svg                           |  47 ---------------------
 symbols/rock_overlay.png                           | Bin 98024 -> 97723 bytes
 symbols/scree_overlay.png                          | Bin 44048 -> 34358 bytes
 symbols/transport_ford.p.16.png                    | Bin 490 -> 0 bytes
 32 files changed, 217 insertions(+), 80 deletions(-)

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