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
..
agg	Merge remote-tracking branch 'origin/master'	2012-06-18 14:36:15 -04:00