Dane Springmeyer eca1c6e46b Merge branch 'master' of github.com:mapnik/mapnik into expr-v2 ... Conflicts: src/load_map.cpp		2013-12-09 11:40:55 -08:00
..
mapnik	Merge branch 'master' of github.com:mapnik/mapnik into expr-v2	2013-12-09 11:40:55 -08:00
build.py	organize text code in subdirectory	2013-11-07 20:09:22 -08:00