Hermann Kraus
|
2b68cea0a1
|
Merge branch 'new-xml'
Conflicts:
include/mapnik/config_error.hpp
include/mapnik/ptree_helpers.hpp
src/formatting/text.cpp
src/libxml2_loader.cpp
src/load_map.cpp
src/metawriter_factory.cpp
src/text_placements/registry.cpp
src/text_placements/simple.cpp
|
2012-03-13 11:11:28 +01:00 |
|
Hermann Kraus
|
502773bea6
|
Only one grammar object per XML tree.
|
2012-03-11 23:24:28 +01:00 |
|
Dane Springmeyer
|
a6f89883d7
|
moar boost::make_shared
|
2012-03-09 16:20:50 -08:00 |
|
Hermann Kraus
|
c3cd50ff57
|
Complete new XML structure.
|
2012-03-07 19:16:41 +01:00 |
|
Hermann Kraus
|
f214675c69
|
Modify all other files for new XML structure.
|
2012-03-07 02:23:16 +01:00 |
|
Hermann Kraus
|
36918e4a8b
|
Remove warning. Empty expressions might exist in real applications without being an error.
|
2012-03-03 17:41:43 +01:00 |
|
Hermann Kraus
|
f06bda1c1c
|
Split file.
|
2012-02-17 15:50:24 +01:00 |
|