Merge commit 'a1ea1701dd535e9d4e9b02167d4c9a13a30d4452' into harfbuzz

Conflicts: include/mapnik/pixel_position.hpp
2013-03-16 17:54:26 +01:00 · 2013-03-16 17:54:26 +01:00 · 680b7f0ba2
commit 680b7f0ba2
parent af6f87b195 a1ea1701dd
1 changed files with 0 additions and 1 deletions
--- a/include/mapnik/pixel_position.hpp
+++ b/include/mapnik/pixel_position.hpp
@ -29,7 +29,6 @@ namespace mapnik
 {

 struct rotation;
-/** Store a pixel position. */
 struct pixel_position
 {
    double x;