Artem Pavlenko 9b61c0effe Merge remote-tracking branch 'origin/master' ... Conflicts: deps/agg/include/agg_pixfmt_rgba.h include/mapnik/image_compositing.hpp src/cairo_renderer.cpp src/image_compositing.cpp		2012-06-18 14:36:15 -04:00
..
include	Merge remote-tracking branch 'origin/master'	2012-06-18 14:36:15 -04:00
src	agg::trans_affine: add static const identity, make mul/div operators const	2012-06-06 17:34:08 +02:00
build.py	agg build: stop restricting CPPPATH so that boost can be reliably found, post b9765ec1db	2012-06-17 16:21:20 -04:00
copying	remove tinyxml, no longer needed by boost ptree as it bundles rapidxml now	2011-10-11 20:02:50 -07:00