Dane Springmeyer 08fa9fd8ec Merge branch '2.3.x' of github.com:mapnik/mapnik ...

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

2013-11-07 09:21:05 -08:00

..

forms

+ move layer info logic into dialog ctor

2010-03-10 17:08:37 +00:00

images

fix minor issues caught in debian packaging relating to executable status and spelling

2010-02-21 17:28:01 +00:00

about_dialog.cpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

about_dialog.hpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

build.py

update copyright year for scons build files

2013-11-05 16:54:13 -08:00

info_dialog.cpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

info_dialog.hpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

layer_info_dialog.cpp

refactor params interface to move lexical cast out of header

2013-01-09 19:12:20 -08:00

layer_info_dialog.hpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

layerdelegate.cpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

layerdelegate.hpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

layerlistmodel.cpp

+ use std::shared_ptr and std::make_shared

2013-09-20 14:01:27 +01:00

layerlistmodel.hpp

+ use std::shared_ptr and std::make_shared

2013-09-20 14:01:27 +01:00

layerwidget.cpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

layerwidget.hpp

remove old $ cruft

2012-08-24 13:49:28 -07:00

main.cpp

fix viewer compile

2013-09-19 18:39:44 -07:00

mainwindow.cpp

+ use std::shared_ptr and std::make_shared

2013-09-20 14:01:27 +01:00

mainwindow.hpp

+ move to QT 5.x (requirement!)

2013-05-16 16:28:08 +01:00

mapnik_viewer.qrc

new icons (TODO!)

2008-02-04 16:15:13 +00:00

mapwidget.cpp

== c++11

2013-10-11 12:36:04 +01:00

mapwidget.hpp

use const std::unique_ptr<> instead of boost::scoped_ptr<>

2013-09-20 14:22:58 +01:00

styles_model.cpp

use const std::unique_ptr<> instead of boost::scoped_ptr<>

2013-09-20 14:22:58 +01:00

styles_model.hpp

use const std::unique_ptr<> instead of boost::scoped_ptr<>

2013-09-20 14:22:58 +01:00

viewer.pro

fix viewer compile

2013-09-19 18:39:44 -07:00