VladPolskiy/mapnik
1
0
Fork 0
mirror of https://github.com/mapnik/mapnik.git synced 2025-08-20 23:23:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch '2.3.x' of github.com:mapnik/mapnik

Browse Source 
Conflicts:
	bindings/python/mapnik_building_symbolizer.cpp
	bindings/python/mapnik_debug_symbolizer.cpp
	bindings/python/mapnik_line_pattern_symbolizer.cpp
	bindings/python/mapnik_line_symbolizer.cpp
	bindings/python/mapnik_markers_symbolizer.cpp
	bindings/python/mapnik_point_symbolizer.cpp
	bindings/python/mapnik_polygon_symbolizer.cpp
	bindings/python/mapnik_python.cpp
	bindings/python/mapnik_raster_symbolizer.cpp
	bindings/python/mapnik_shield_symbolizer.cpp
	bindings/python/mapnik_symbolizer.cpp
This commit is contained in:
Dane Springmeyer
2013-11-07 09:21:05 -08:00
parent 2e8c383730 08cfc5d0f3
commit 08fa9fd8ec
60 changed files with 4306 additions and 3388 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
utils/pgsql2sqlite/build.py
View File

@ -1,7 +1,7 @@
#
# This file is part of Mapnik (c++ mapping toolkit)
#
# Copyright (C) 2009 Artem Pavlenko, Dane Springmeyer
# Copyright (C) 2013 Artem Pavlenko
#
# Mapnik is free software; you can redistribute it and/or
# modify it under the terms of the GNU Lesser General Public
@ -19,6 +19,7 @@
#
#
import os
from copy import copy