[osm-tile-server] 32/70: Merge tag 'upstream/2.34.0'
Ruben Undheim
rubund-guest at moszumanska.debian.org
Tue Nov 3 23:13:05 UTC 2015
This is an automated email from the git hooks/post-receive script.
rubund-guest pushed a commit to branch master
in repository osm-tile-server.
commit eb799fece176be04570ba2e7cea9e26f3419ba2a
Merge: c281a14 f360d66
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Aug 30 16:57:17 2015 +0200
Merge tag 'upstream/2.34.0'
Upstream version 2.34.0
.gitattributes | 1 +
.gitignore | 1 +
.travis.yml | 10 +-
INSTALL.md | 7 +-
README.md | 2 +-
admin.mss | 6 +-
aerialways.mss | 39 +-
amenity-points.mss | 812 ++++++++++++++++++++--------
buildings.mss | 10 +-
citywalls.mss | 11 -
get-shapefiles.sh | 31 +-
landcover.mss | 270 +++++----
preview.png | Bin 219577 -> 79418 bytes
project.mml | 242 +++++----
project.yaml | 710 ++++++++++++++++--------
roads.mss | 441 +++++++++------
shapefiles.mss | 22 +-
stations.mss | 6 +-
symbols/amenity_court.p.20.png | Bin 802 -> 0 bytes
symbols/archaeological_site.16.svg | 14 +
symbols/beauty-14.svg | 40 ++
symbols/bench.16.svg | 40 ++
symbols/beverages-14.svg | 47 ++
symbols/bicycle_parking.16.svg | 40 ++
symbols/bus_stop.12.svg | 14 +
symbols/bus_stop.p.12.png | Bin 353 -> 0 bytes
symbols/cable_car.png | Bin 229 -> 0 bytes
symbols/car_parts-14.svg | 40 ++
symbols/caravan_park.16.svg | 14 +
symbols/caravan_park.p.24.png | Bin 486 -> 0 bytes
symbols/chair_lift.png | Bin 230 -> 0 bytes
symbols/chemist-14.svg | 40 ++
symbols/community_centre-14.svg | 38 ++
symbols/computer-14.svg | 30 +
symbols/confectionery-14.svg | 33 ++
symbols/courthouse-16.svg | 40 ++
symbols/elevator-12.svg | 38 ++
symbols/emergency_phone.16.svg | 14 +
symbols/entrance.10.svg | 40 ++
symbols/forest.png | Bin 190 -> 17339 bytes
symbols/garden_centre-14.svg | 40 ++
symbols/greengrocer-14.svg | 40 ++
symbols/hifi-14.svg | 38 ++
symbols/hostel.16.svg | 40 ++
symbols/hostel.p.20.png | Bin 597 -> 0 bytes
symbols/hotel.16.svg | 40 ++
symbols/hotel2.p.20.png | Bin 368 -> 0 bytes
symbols/hunting-stand.16.svg | 40 ++
symbols/ice-cream-14.svg | 40 ++
symbols/laundry-14.svg | 45 ++
symbols/lighthouse.16.svg | 40 ++
symbols/lighthouse.p.20.png | Bin 487 -> 0 bytes
symbols/monument.16.svg | 14 +
symbols/motel.16.svg | 40 ++
symbols/motel.p.20.png | Bin 657 -> 0 bytes
symbols/motorcycle-14.svg | 36 ++
symbols/motorcycle_parking.16.svg | 38 ++
symbols/musical_instrument-14.svg | 24 +
symbols/newsagent-14.svg | 46 ++
symbols/orchard.png | Bin 134 -> 94 bytes
symbols/perfumery-14.svg | 31 ++
symbols/photo-14.svg | 31 ++
symbols/post_box-12.svg | 37 ++
symbols/post_box.p.16.png | Bin 367 -> 0 bytes
symbols/post_office-14.svg | 40 ++
symbols/post_office.p.16.png | Bin 494 -> 0 bytes
symbols/power_wind-16.svg | 40 ++
symbols/power_wind.png | Bin 638 -> 0 bytes
symbols/quarry.png | Bin 189 -> 9863 bytes
symbols/seafood-14.svg | 24 +
symbols/shop_alcohol.16.svg | 14 +
symbols/shop_bicycle.16.svg | 40 ++
symbols/shop_clothes.16.svg | 14 +
symbols/shop_clothes.svg | 4 -
symbols/shop_diy.16.svg | 40 ++
symbols/shop_diy.p.16.png | Bin 383 -> 0 bytes
symbols/shop_electronics.16.svg | 14 +
symbols/shop_furniture.16.svg | 14 +
symbols/shop_gift.16.svg | 14 +
symbols/shop_jewelry.16.svg | 14 +
symbols/shop_mobile_phone.16.svg | 14 +
symbols/shop_optician.16.svg | 14 +
symbols/shop_shoes.16.svg | 40 ++
symbols/shopping_bicycle.p.16.png | Bin 522 -> 0 bytes
symbols/sosphone.png | Bin 508 -> 0 bytes
symbols/stationery-14.svg | 33 ++
symbols/taxi.16.svg | 14 +
symbols/telephone.16.svg | 14 +
symbols/telephone.p.16.png | Bin 444 -> 0 bytes
symbols/tourist_archaeological2.glow.24.png | Bin 1134 -> 0 bytes
symbols/tower_water.p.20.png | Bin 477 -> 0 bytes
symbols/toys-14.svg | 37 ++
symbols/travel_agency-14.svg | 33 ++
symbols/variety_store-14.svg | 35 ++
symbols/veterinary-14.svg | 40 ++
symbols/view_point.p.16.png | Bin 636 -> 0 bytes
symbols/viewpoint.16.svg | 14 +
symbols/vineyard.png | Bin 190 -> 196 bytes
symbols/walking.n.12.png | Bin 372 -> 0 bytes
symbols/waste_basket.10.svg | 40 ++
symbols/water_park.16.svg | 14 +
symbols/water_park.p.20.png | Bin 802 -> 0 bytes
symbols/water_tower.16.svg | 41 ++
symbols/wetland.png | Bin 2832 -> 2698 bytes
symbols/wetland_bog.png | Bin 0 -> 26984 bytes
symbols/wetland_mangrove.png | Bin 0 -> 30426 bytes
symbols/wetland_marsh.png | Bin 0 -> 32247 bytes
symbols/wetland_reed.png | Bin 0 -> 35227 bytes
symbols/wetland_swamp.png | Bin 0 -> 29181 bytes
symbols/windmill.16.svg | 14 +
symbols/windmill.png | Bin 617 -> 0 bytes
symbols/zoo.png | Bin 165 -> 0 bytes
water-features.mss | 8 +-
water.mss | 37 +-
114 files changed, 3625 insertions(+), 892 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osm-tile-server.git
More information about the Pkg-grass-devel
mailing list