sij/mapnik
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
mapnik/demo/viewer
History
artemp 4f4e2b001e Merge branch 'master' into c++11 
Conflicts:
	SConstruct
	benchmark/run.cpp
	bindings/python/mapnik_datasource.cpp
	bindings/python/mapnik_feature.cpp
	bindings/python/python_optional.hpp
	include/mapnik/css_color_grammar.hpp
	include/mapnik/expression_grammar.hpp
	include/mapnik/feature.hpp
	include/mapnik/feature_style_processor_impl.hpp
	include/mapnik/image_filter_types.hpp
	include/mapnik/image_util.hpp
	include/mapnik/json/geometry_generator_grammar.hpp
	include/mapnik/json/geometry_grammar.hpp
	include/mapnik/processed_text.hpp
	include/mapnik/tiff_io.hpp
	include/mapnik/util/geometry_svg_generator.hpp
	include/mapnik/util/geometry_wkt_generator.hpp
	include/mapnik/utils.hpp
	include/mapnik/webp_io.hpp
	include/mapnik/wkt/wkt_grammar.hpp
	plugins/input/shape/shape_datasource.cpp
	plugins/input/shape/shapefile.hpp
	src/expression_grammar.cpp
	src/expression_string.cpp
	src/image_util.cpp
	src/json/feature_collection_parser.cpp
	src/json/feature_parser.cpp
	src/miniz.c
	src/symbolizer_helpers.cpp
	src/tiff_reader.cpp
	src/webp_reader.cpp
	tests/cpp_tests/geometry_converters_test.cpp
	tests/cpp_tests/image_io_test.cpp
	tests/cpp_tests/map_request_test.cpp
	tests/python_tests/image_test.py
	tests/visual_tests/test.py
2013-08-30 09:46:09 +01: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 remote the last references 2012-08-27 16:43:40 -07: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 remove old $ cruft 2012-08-24 13:49:28 -07:00
layerlistmodel.hpp remove old $ cruft 2012-08-24 13:49:28 -07: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 start centralizing filesystem operations in mapnik::util::fs - refs #1177 2013-06-02 19:28:24 -07:00
mainwindow.cpp + move to QT 5.x (requirement!) 2013-05-16 16:29:00 +01:00
mainwindow.hpp + move to QT 5.x (requirement!) 2013-05-16 16:29:00 +01:00
mapnik_viewer.qrc new icons (TODO!) 2008-02-04 16:15:13 +00:00
mapwidget.cpp + move to QT 5.x (requirement!) 2013-05-16 16:29:00 +01:00
mapwidget.hpp remove old $ cruft 2012-08-24 13:49:28 -07:00
styles_model.cpp + fix compilation (temp) 2013-06-17 10:48:15 +01:00
styles_model.hpp remove old $ cruft 2012-08-24 13:49:28 -07:00
viewer.pro Merge branch 'master' into c++11 2013-08-30 09:46:09 +01:00