This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to annotated tag 
debian/0.14+svnfixes.20090912-1.bpo50+1
in repository merkaartor.

commit 8870594a3e0bc43fcb6f9d11b889a4d4e504e840
Merge: da2656e 144cb2a
Author: Bernd Zeimetz <be...@bzed.de>
Date:   Wed Sep 23 18:47:08 2009 +0200

    Merge branch 'upstream-lenny-backports' into lenny-backports

 .indent.pro                                        |     3 +
 AUTHORS                                            |     4 +-
 AboutDialog.ui                                     |   207 -
 CHANGELOG                                          |    82 +-
 Command/Command.cpp                                |   490 -
 Command/Command.h                                  |   108 -
 Command/DocumentCommands.cpp                       |   284 -
 Command/DocumentCommands.h                         |    60 -
 Command/FeatureCommands.cpp                        |   403 -
 Command/FeatureCommands.h                          |    91 -
 Command/RelationCommands.cpp                       |   246 -
 Command/RelationCommands.h                         |    64 -
 Command/RoadCommands.cpp                           |   216 -
 Command/RoadCommands.h                             |    58 -
 Command/TrackPointCommands.cpp                     |   112 -
 Command/TrackPointCommands.h                       |    34 -
 Command/TrackSegmentCommands.cpp                   |   190 -
 Command/TrackSegmentCommands.h                     |    58 -
 Config.pri                                         |    18 -
 Data/rotterdam.osm                                 |   788 --
 Data/spangen.gpx                                   |   289 -
 DirtyDock.cpp                                      |   197 -
 DirtyDock.h                                        |    57 -
 GPS/GPS.pri                                        |    14 -
 GPS/SatelliteStrengthView.cpp                      |    51 -
 GPS/SatelliteStrengthView.h                        |    34 -
 GPS/old_qgpsmainwindowui.ui                        |   724 --
 GPS/qgps.cpp                                       |   226 -
 GPS/qgps.h                                         |    66 -
 GPS/qgpsdevice.cpp                                 |  1026 --
 GPS/qgpsdevice.h                                   |   292 -
 GPS/qgpssatellitetracker.cpp                       |   142 -
 GPS/qgpssatellitetracker.h                         |    48 -
 GeoImageDock.cpp                                   |   590 -
 GeoImageDock.h                                     |   113 -
 GotoDialog.cpp                                     |   192 -
 GotoDialog.h                                       |    57 -
 INSTALL                                            |    17 +-
 Icons/48x48/merkaartor.png                         |   Bin 0 -> 5671 bytes
 Icons/AllIcons.qrc                                 |   767 +-
 Icons/Mapnik/alpinehut.p.16.png                    |   Bin 0 -> 565 bytes
 Icons/Mapnik/bollard.png                           |   Bin 0 -> 104 bytes
 Icons/Mapnik/car_share.p.16.png                    |   Bin 0 -> 489 bytes
 Icons/Mapnik/fast_food.png                         |   Bin 0 -> 3091 bytes
 Icons/Mapnik/firestation.p.16.png                  |   Bin 0 -> 479 bytes
 Icons/Mapnik/hostel.p.20.png                       |   Bin 0 -> 539 bytes
 Icons/Mapnik/lighthouse.p.20.png                   |   Bin 0 -> 487 bytes
 Icons/Mapnik/memorial.png                          |   Bin 0 -> 3055 bytes
 Icons/Mapnik/police.p.16.png                       |   Bin 0 -> 657 bytes
 Icons/Mapnik/rental_bicycle.p.20.png               |   Bin 0 -> 802 bytes
 Icons/Mapnik/school.png                            |   Bin 0 -> 3136 bytes
 Icons/Mapnik/shelter2.p.16.png                     |   Bin 0 -> 571 bytes
 Icons/Mapnik/tower_water.p.20.png                  |   Bin 0 -> 477 bytes
 Icons/Mapnik/traffic_light.png                     |   Bin 0 -> 1169 bytes
 Icons/Mercator_16x16.ico                           |   Bin 0 -> 1406 bytes
 Icons/actions/GPS.png                              |   Bin 0 -> 695 bytes
 Icons/actions/camera.png                           |   Bin 0 -> 580 bytes
 Icons/actions/edit_rotate.png                      |   Bin 0 -> 869 bytes
 Icons/actions/edit_rotate.svg                      |   565 +
 Icons/rotate.png                                   |   Bin 0 -> 819 bytes
 Icons/rotate.svg                                   |   565 +
 Icons/src/actions/GPS.svg                          |    73 +
 Icons/src/actions/camera.svg                       |    57 +
 ImportExport/ExportGPX.cpp                         |    89 -
 ImportExport/IImportExport.cpp                     |    59 -
 ImportExport/IImportExport.h                       |    59 -
 ImportExport/ImportExportKML.cpp                   |   321 -
 ImportExport/ImportExportOsmBin.cpp                |   838 --
 ImportExport/ImportExportOsmBin.h                  |   169 -
 ImportExport/ImportExportSHP.cpp                   |   179 -
 ImportExport/ImportExportSHP.h                     |    38 -
 InfoDock.cpp                                       |    99 -
 InfoDock.h                                         |    49 -
 Interaction/CreateAreaInteraction.cpp              |   212 -
 Interaction/CreateAreaInteraction.h                |    41 -
 Interaction/CreateDoubleWayInteraction.cpp         |   233 -
 Interaction/CreateDoubleWayInteraction.h           |    39 -
 Interaction/CreateNodeInteraction.cpp              |    63 -
 Interaction/CreateNodeInteraction.h                |    16 -
 Interaction/CreateRoundaboutInteraction.cpp        |   164 -
 Interaction/CreateRoundaboutInteraction.h          |    33 -
 Interaction/CreateSingleWayInteraction.cpp         |   194 -
 Interaction/CreateSingleWayInteraction.h           |    38 -
 Interaction/EditInteraction.cpp                    |   375 -
 Interaction/EditInteraction.h                      |    42 -
 Interaction/Interaction.cpp                        |   146 -
 Interaction/Interaction.h                          |   255 -
 Interaction/MoveTrackPointInteraction.cpp          |   184 -
 Interaction/MoveTrackPointInteraction.h            |    31 -
 Interaction/ZoomInteraction.cpp                    |    63 -
 Interaction/ZoomInteraction.h                      |    28 -
 LayerDock.cpp                                      |   275 -
 LayerDock.h                                        |    58 -
 LayerWidget.cpp                                    |   636 --
 LayerWidget.h                                      |   208 -
 Main.cpp                                           |    56 -
 MainWindow.cpp                                     |  2443 -----
 MainWindow.h                                       |   233 -
 MainWindow.ui                                      |  1427 ---
 Map/Coord.cpp                                      |   140 -
 Map/Coord.h                                        |   275 -
 Map/DownloadOSM.cpp                                |   762 --
 Map/DownloadOSM.h                                  |    86 -
 Map/ExportOSM.cpp                                  |   118 -
 Map/ExportOSM.h                                    |    18 -
 Map/FeatureManipulations.cpp                       |   469 -
 Map/FeatureManipulations.h                         |    28 -
 Map/ImportGPX.cpp                                  |   239 -
 Map/ImportGPX.h                                    |    19 -
 Map/ImportNGT.cpp                                  |    46 -
 Map/ImportOSM.cpp                                  |   484 -
 Map/MapDocument.cpp                                |   776 --
 Map/MapDocument.h                                  |   150 -
 Map/MapFeature.cpp                                 |   733 --
 Map/MapFeature.h                                   |   263 -
 Map/MapLayer.cpp                                   |  1325 ---
 Map/MapLayer.h                                     |   286 -
 Map/MapTypedef.h                                   |    22 -
 Map/Painting.cpp                                   |   216 -
 Map/Painting.h                                     |    29 -
 Map/Projection.cpp                                 |   476 -
 Map/Projection.h                                   |    72 -
 Map/Relation.cpp                                   |   745 --
 Map/Relation.h                                     |    69 -
 Map/Road.cpp                                       |   976 --
 Map/Road.h                                         |   119 -
 Map/TrackPoint.cpp                                 |   443 -
 Map/TrackPoint.h                                   |    84 -
 Map/TrackSegment.cpp                               |   312 -
 Map/TrackSegment.h                                 |    64 -
 MapView.cpp                                        |  1214 ---
 MapView.h                                          |   126 -
 Merkaartor.pri                                     |   155 -
 Merkaartor.pro                                     |   232 +-
 NameFinder/httpquery.cpp                           |    99 -
 NameFinder/httpquery.h                             |    69 -
 NameFinder/namefinderwidget.cpp                    |   143 -
 NameFinder/namefinderwidget.h                      |    82 -
 PaintStyle/EditPaintStyle.cpp                      |   372 -
 PaintStyle/EditPaintStyle.h                        |    94 -
 PaintStyle/PaintStyle.cpp                          |  1239 ---
 PaintStyle/PaintStyle.h                            |   196 -
 PaintStyle/PaintStyleEditor.cpp                    |   583 -
 PaintStyle/PaintStyleEditor.h                      |    81 -
 PaintStyle/TagSelector.cpp                         |   598 --
 PaintStyle/TagSelector.h                           |   159 -
 Preferences/MerkaartorPreferences.cpp              |  1376 ---
 Preferences/MerkaartorPreferences.h                |   446 -
 Preferences/PreferencesDialog.cpp                  |   514 -
 Preferences/PreferencesDialog.h                    |    76 -
 Preferences/PreferencesDialog.ui                   |  1314 ---
 Preferences/TMSPreferencesDialog.cpp               |   197 -
 Preferences/TMSPreferencesDialog.h                 |    65 -
 Preferences/WMSPreferencesDialog.cpp               |   202 -
 Preferences/WMSPreferencesDialog.h                 |    65 -
 Preferences/WMSPreferencesDialog.ui                |   254 -
 PropertiesDock.cpp                                 |   950 --
 PropertiesDock.h                                   |   114 -
 QMapControl.pri                                    |    39 -
 QMapControl/IImageManager.h                        |   108 -
 QMapControl/browserimagemanager.cpp                |   289 -
 QMapControl/browserimagemanager.h                  |   142 -
 QMapControl/browserimagemanagerthreaded.cpp        |   295 -
 QMapControl/browserimagemanagerthreaded.h          |   148 -
 QMapControl/circlepoint.cpp                        |    64 -
 QMapControl/circlepoint.h                          |    69 -
 QMapControl/curve.cpp                              |    34 -
 QMapControl/curve.h                                |    57 -
 QMapControl/geometry.cpp                           |    80 -
 QMapControl/geometry.h                             |   148 -
 QMapControl/geometrylayer.cpp                      |    13 -
 QMapControl/geometrylayer.h                        |    38 -
 QMapControl/gps_position.cpp                       |     6 -
 QMapControl/gps_position.h                         |    26 -
 QMapControl/imagemanager.cpp                       |   151 -
 QMapControl/imagemanager.h                         |   106 -
 QMapControl/images/marker1.png                     |   Bin 238 -> 0 bytes
 QMapControl/images/marker2.png                     |   Bin 226 -> 0 bytes
 QMapControl/images/marker3.png                     |   Bin 1377 -> 0 bytes
 QMapControl/layer.cpp                              |   302 -
 QMapControl/layer.h                                |   166 -
 QMapControl/layermanager.cpp                       |   540 -
 QMapControl/layermanager.h                         |   214 -
 QMapControl/linestring.cpp                         |   165 -
 QMapControl/linestring.h                           |   112 -
 QMapControl/mainz_gps.nme                          |    84 -
 QMapControl/mapadapter.cpp                         |    81 -
 QMapControl/mapadapter.h                           |   159 -
 QMapControl/maplayer.cpp                           |    13 -
 QMapControl/maplayer.h                             |    37 -
 QMapControl/mapnetwork.cpp                         |   153 -
 QMapControl/mapnetwork.h                           |    75 -
 QMapControl/osmmapadapter.cpp                      |    14 -
 QMapControl/osmmapadapter.h                        |    22 -
 QMapControl/point.cpp                              |   322 -
 QMapControl/point.h                                |   207 -
 QMapControl/tilemapadapter.h                       |    68 -
 QMapControl/wmsmapadapter.cpp                      |   119 -
 QMapControl/wmsmapadapter.h                        |    78 -
 QMapControl/yahoolegalmapadapter.cpp               |    88 -
 QMapControl/yahoolegalmapadapter.h                 |    60 -
 QtStyles/QtStyles.pri                              |    21 -
 QtStyles/skulpture22/sk_factory.h                  |   165 -
 QtStyles/skulpture22/skulpture.cpp                 | 10757 -------------------
 Render/NativeRenderDialog.cpp                      |   196 -
 Render/NativeRenderDialog.h                        |    53 -
 Render/OsmaRenderDialog.cpp                        |   358 -
 Render/OsmaRenderDialog.h                          |    59 -
 Render/OsmaRenderDialog.ui                         |   455 -
 Render/Render.pri                                  |    60 -
 Render/osmarender.qrc                              |    18 -
 Render/osmarender/stylesheets/caption-z0.xml       |   147 -
 Render/osmarender/stylesheets/caption-z1.xml       |   155 -
 Render/osmarender/stylesheets/caption-z10.xml      |   163 -
 Render/osmarender/stylesheets/caption-z11.xml      |   165 -
 Render/osmarender/stylesheets/caption-z2.xml       |   152 -
 Render/osmarender/stylesheets/caption-z3.xml       |   152 -
 Render/osmarender/stylesheets/caption-z4.xml       |   152 -
 Render/osmarender/stylesheets/caption-z5.xml       |   160 -
 Render/osmarender/stylesheets/caption-z6.xml       |   158 -
 Render/osmarender/stylesheets/caption-z7.xml       |   153 -
 Render/osmarender/stylesheets/caption-z8.xml       |   151 -
 Render/osmarender/stylesheets/caption-z9.xml       |   163 -
 Render/osmarender/stylesheets/captionless-z12.xml  |  1301 ---
 Render/osmarender/stylesheets/maplint.xml          |   589 -
 Render/osmarender/stylesheets/markers.xml          |    53 -
 .../stylesheets/osm-POI-features-z12.xml           |    34 -
 .../stylesheets/osm-POI-features-z13.xml           |    34 -
 .../stylesheets/osm-POI-features-z14.xml           |    34 -
 .../stylesheets/osm-POI-features-z15.xml           |    34 -
 .../stylesheets/osm-POI-features-z16.xml           |    34 -
 .../stylesheets/osm-POI-features-z17.xml           |  1595 ---
 .../stylesheets/osm-map-features-z10.xml           |  1545 ---
 .../stylesheets/osm-map-features-z11.xml           |  1543 ---
 .../stylesheets/osm-map-features-z12.xml           |  1828 ----
 .../stylesheets/osm-map-features-z13.xml           |  2093 ----
 .../stylesheets/osm-map-features-z14.xml           |  2770 -----
 .../stylesheets/osm-map-features-z15.xml           |  3140 ------
 .../stylesheets/osm-map-features-z16.xml           |  4039 -------
 .../stylesheets/osm-map-features-z17.xml           |  5221 ---------
 .../osmarender/stylesheets/osm-map-features-z6.xml |  1492 ---
 .../osmarender/stylesheets/osm-map-features-z7.xml |  1491 ---
 .../osmarender/stylesheets/osm-map-features-z8.xml |   618 --
 .../osmarender/stylesheets/osm-map-features-z9.xml |   617 --
 Render/osmarender/stylesheets/poi-testfile.osm     |   300 -
 Render/osmarender/stylesheets/standard.xml         |  2259 ----
 Render/osmarender/stylesheets/symbols/airport.svg  |     4 -
 Render/osmarender/stylesheets/symbols/atm.svg      |    87 -
 Render/osmarender/stylesheets/symbols/bank.svg     |     5 -
 Render/osmarender/stylesheets/symbols/bar.svg      |     4 -
 Render/osmarender/stylesheets/symbols/bird.svg     |    26 -
 Render/osmarender/stylesheets/symbols/bus.svg      |    12 -
 Render/osmarender/stylesheets/symbols/bus_sta.svg  |   113 -
 Render/osmarender/stylesheets/symbols/cafe.svg     |    40 -
 Render/osmarender/stylesheets/symbols/campSite.svg |     4 -
 .../osmarender/stylesheets/symbols/car_sharing.svg |   123 -
 Render/osmarender/stylesheets/symbols/church.svg   |     6 -
 Render/osmarender/stylesheets/symbols/cinema.svg   |    20 -
 .../stylesheets/symbols/curling-borderless.svg     |    42 -
 Render/osmarender/stylesheets/symbols/curling.svg  |    54 -
 Render/osmarender/stylesheets/symbols/disused.svg  |     4 -
 Render/osmarender/stylesheets/symbols/doctor.svg   |     5 -
 .../stylesheets/symbols/drinking_water.svg         |     5 -
 Render/osmarender/stylesheets/symbols/fastfood.svg |   165 -
 .../osmarender/stylesheets/symbols/firebrigade.svg |    71 -
 .../osmarender/stylesheets/symbols/golfCourse.svg  |     4 -
 .../stylesheets/symbols/handball-borderless.svg    |    32 -
 Render/osmarender/stylesheets/symbols/handball.svg |    46 -
 Render/osmarender/stylesheets/symbols/helipad.svg  |    18 -
 Render/osmarender/stylesheets/symbols/hospital.svg |     5 -
 Render/osmarender/stylesheets/symbols/hostel.svg   |     4 -
 Render/osmarender/stylesheets/symbols/hotel.svg    |     4 -
 .../stylesheets/symbols/hotel_and_restaurant.svg   |    34 -
 .../osmarender/stylesheets/symbols/housenumber.svg |     4 -
 .../osmarender/stylesheets/symbols/information.svg |     5 -
 Render/osmarender/stylesheets/symbols/khanda.svg   |     6 -
 Render/osmarender/stylesheets/symbols/library.svg  |    12 -
 .../osmarender/stylesheets/symbols/lighthouse.svg  |   104 -
 .../stylesheets/symbols/man-made-halfpipe.svg      |     4 -
 Render/osmarender/stylesheets/symbols/mosque.svg   |     4 -
 Render/osmarender/stylesheets/symbols/museum.svg   |    10 -
 .../stylesheets/symbols/park_and_ride.svg          |    30 -
 Render/osmarender/stylesheets/symbols/parking.svg  |    23 -
 .../osmarender/stylesheets/symbols/parking_fee.svg |    83 -
 .../stylesheets/symbols/parking_roof.svg           |    28 -
 .../stylesheets/symbols/parking_roof_fee.svg       |    83 -
 Render/osmarender/stylesheets/symbols/peak.svg     |     4 -
 .../stylesheets/symbols/petrolStation.svg          |     4 -
 Render/osmarender/stylesheets/symbols/pharmacy.svg |     5 -
 .../osmarender/stylesheets/symbols/playground.svg  |    70 -
 Render/osmarender/stylesheets/symbols/postbox.svg  |     2 -
 .../osmarender/stylesheets/symbols/postoffice.svg  |     5 -
 .../osmarender/stylesheets/symbols/power-tower.svg |     4 -
 Render/osmarender/stylesheets/symbols/pub.svg      |     9 -
 Render/osmarender/stylesheets/symbols/pubx.svg     |    12 -
 .../stylesheets/symbols/railway-crossing.svg       |     7 -
 .../osmarender/stylesheets/symbols/recycling.svg   |     9 -
 .../osmarender/stylesheets/symbols/restaurant.svg  |     7 -
 .../stylesheets/symbols/roundabout_left.svg        |     7 -
 .../stylesheets/symbols/roundabout_right.svg       |     9 -
 Render/osmarender/stylesheets/symbols/school.svg   |    14 -
 .../stylesheets/symbols/shelter-fireplace.svg      |    22 -
 Render/osmarender/stylesheets/symbols/shelter.svg  |    19 -
 Render/osmarender/stylesheets/symbols/slipway.svg  |     6 -
 .../stylesheets/symbols/soccer-borderless.svg      |     8 -
 Render/osmarender/stylesheets/symbols/soccer.svg   |     9 -
 .../osmarender/stylesheets/symbols/speed_trap.svg  |     5 -
 Render/osmarender/stylesheets/symbols/subway.svg   |    21 -
 .../osmarender/stylesheets/symbols/supermarket.svg |    18 -
 .../stylesheets/symbols/swimming-borderless.svg    |     5 -
 Render/osmarender/stylesheets/symbols/swimming.svg |     6 -
 .../osmarender/stylesheets/symbols/synagogue.svg   |     4 -
 .../osmarender/stylesheets/symbols/telephone.svg   |    29 -
 .../stylesheets/symbols/tennis-borderless.svg      |     9 -
 Render/osmarender/stylesheets/symbols/tennis.svg   |    10 -
 Render/osmarender/stylesheets/symbols/theatre.svg  |    20 -
 Render/osmarender/stylesheets/symbols/toilets.svg  |     9 -
 .../stylesheets/symbols/traffic_signal.svg         |    11 -
 .../osmarender/stylesheets/symbols/university.svg  |     6 -
 .../osmarender/stylesheets/symbols/viewpoint.svg   |    57 -
 Render/osmarender/stylesheets/symbols/windmill.svg |     8 -
 .../osmarender/stylesheets/symbols/windpower.svg   |    74 -
 Render/osmarender/xslt/osmarender                  |    93 -
 Render/osmarender/xslt/osmarender.xsl              |  4595 --------
 Render/osmarender/xslt/xsltrans                    |   170 -
 StyleDock.cpp                                      |   103 -
 StyleDock.h                                        |    49 -
 Styles/Mapnik.mas                                  |    10 +-
 Styles/MapnikPlus.mas                              |     5 +-
 Sync/DirtyList.cpp                                 |   782 --
 Sync/DirtyList.h                                   |   160 -
 Sync/SyncOSM.cpp                                   |    47 -
 Sync/SyncOSM.h                                     |    12 -
 TagModel.cpp                                       |   181 -
 TagModel.h                                         |    38 -
 TagTemplate/TagTemplate.cpp                        |  1107 --
 Templates/Brussels.mat                             |     7 +
 Templates/default.mat                              |   332 +-
 Templates/mine.mat                                 |   272 +-
 Tools/ActionsDialog.cpp                            |   159 -
 Tools/WorldOsbManager.cpp                          |   249 -
 Utils/EditCompleterDelegate.cpp                    |   131 -
 Utils/LineF.h                                      |   305 -
 Utils/MDockAncestor.cpp                            |    40 -
 Utils/PictureViewerDialog.cpp                      |    50 -
 Utils/SelectionDialog.cpp                          |    64 -
 Utils/SelectionDialog.ui                           |   152 -
 Utils/SlippyMapWidget.cpp                          |   425 -
 Utils/SlippyMapWidget.h                            |    90 -
 Utils/SvgCache.cpp                                 |    32 -
 Utils/SvgCache.h                                   |     8 -
 Utils/Utils.qrc                                    |     5 -
 include/ggl/algorithms/append.hpp                  |   197 +
 include/ggl/algorithms/area.hpp                    |   220 +
 include/ggl/algorithms/assign.hpp                  |   410 +
 include/ggl/algorithms/buffer.hpp                  |   154 +
 include/ggl/algorithms/centroid.hpp                |   278 +
 include/ggl/algorithms/clear.hpp                   |   161 +
 include/ggl/algorithms/combine.hpp                 |   189 +
 include/ggl/algorithms/convert.hpp                 |   161 +
 include/ggl/algorithms/convex_hull.hpp             |   127 +
 include/ggl/algorithms/correct.hpp                 |   161 +
 include/ggl/algorithms/detail/calculate_null.hpp   |    33 +
 include/ggl/algorithms/detail/not.hpp              |    45 +
 include/ggl/algorithms/disjoint.hpp                |   226 +
 include/ggl/algorithms/distance.hpp                |   359 +
 include/ggl/algorithms/envelope.hpp                |   329 +
 include/ggl/algorithms/equals.hpp                  |   136 +
 include/ggl/algorithms/for_each.hpp                |   268 +
 include/ggl/algorithms/intermediate.hpp            |   126 +
 include/ggl/algorithms/intersection.hpp            |   444 +
 include/ggl/algorithms/intersection_linestring.hpp |   239 +
 .../ggl/algorithms/intersection_polygon.hpp        |     0
 .../ggl/algorithms/intersection_segment.hpp        |     0
 include/ggl/algorithms/labelinfo.hpp               |   103 +
 include/ggl/algorithms/length.hpp                  |   165 +
 include/ggl/algorithms/make.hpp                    |   123 +
 include/ggl/algorithms/num_points.hpp              |   147 +
 include/ggl/algorithms/overlaps.hpp                |    50 +
 include/ggl/algorithms/overlay/copy_segments.hpp   |   199 +
 .../overlay/enrich_intersection_points.hpp         |   460 +
 .../algorithms/overlay/get_intersection_points.hpp |   622 ++
 .../ggl/algorithms/overlay/intersection_point.hpp  |   196 +
 .../overlay/merge_intersection_points.hpp          |   170 +
 .../ggl/algorithms/overlay/segment_identifier.hpp  |    86 +
 include/ggl/algorithms/overlay/traverse.hpp        |   167 +
 include/ggl/algorithms/parse.hpp                   |   114 +
 include/ggl/algorithms/perimeter.hpp               |   141 +
 include/ggl/algorithms/point_on_line.hpp           |    72 +
 include/ggl/algorithms/remove_holes_if.hpp         |   132 +
 include/ggl/algorithms/sectionalize.hpp            |   521 +
 include/ggl/algorithms/selected.hpp                |   279 +
 include/ggl/algorithms/simplify.hpp                |   342 +
 include/ggl/algorithms/transform.hpp               |   291 +
 include/ggl/algorithms/within.hpp                  |   416 +
 include/ggl/arithmetic/arithmetic.hpp              |   209 +
 include/ggl/arithmetic/dot_product.hpp             |    70 +
 include/ggl/core/access.hpp                        |   292 +
 include/ggl/core/concepts/box_concept.hpp          |   109 +
 include/ggl/core/concepts/linestring_concept.hpp   |    84 +
 include/ggl/core/concepts/nsphere_concept.hpp      |   119 +
 include/ggl/core/concepts/point_concept.hpp        |   146 +
 include/ggl/core/concepts/polygon_concept.hpp      |   120 +
 include/ggl/core/concepts/ring_concept.hpp         |    83 +
 include/ggl/core/concepts/segment_concept.hpp      |   119 +
 include/ggl/core/coordinate_dimension.hpp          |   111 +
 include/ggl/core/coordinate_system.hpp             |    79 +
 include/ggl/core/coordinate_type.hpp               |    72 +
 include/ggl/core/cs.hpp                            |   234 +
 include/ggl/core/exception.hpp                     |    26 +
 include/ggl/core/exterior_ring.hpp                 |   100 +
 include/ggl/core/geometry_id.hpp                   |    80 +
 include/ggl/core/interior_rings.hpp                |   165 +
 include/ggl/core/is_linear.hpp                     |    59 +
 include/ggl/core/is_multi.hpp                      |    49 +
 include/ggl/core/point_type.hpp                    |   109 +
 include/ggl/core/radian_access.hpp                 |   118 +
 include/ggl/core/radius.hpp                        |   152 +
 include/ggl/core/replace_point_type.hpp            |    99 +
 include/ggl/core/reverse_dispatch.hpp              |    61 +
 include/ggl/core/ring_type.hpp                     |    97 +
 include/ggl/core/tag.hpp                           |    65 +
 include/ggl/core/tags.hpp                          |    64 +
 include/ggl/core/topological_dimension.hpp         |    89 +
 include/ggl/detail/endian.hpp                      |   255 +
 .../adapted/boost_array_as_linestring.hpp          |    40 +
 .../ggl/geometries/adapted/boost_array_as_ring.hpp |    40 +
 include/ggl/geometries/adapted/c_array.hpp         |    88 +
 .../ggl/geometries/adapted/c_array_cartesian.hpp   |    37 +
 .../ggl/geometries/adapted/c_array_geographic.hpp  |    35 +
 .../ggl/geometries/adapted/std_as_linestring.hpp   |    61 +
 include/ggl/geometries/adapted/std_as_ring.hpp     |    43 +
 include/ggl/geometries/adapted/tuple.hpp           |   100 +
 include/ggl/geometries/adapted/tuple_cartesian.hpp |    41 +
 .../ggl/geometries/adapted/tuple_geographic.hpp    |    41 +
 include/ggl/geometries/box.hpp                     |   110 +
 include/ggl/geometries/cartesian2d.hpp             |    29 +
 include/ggl/geometries/cartesian3d.hpp             |    28 +
 include/ggl/geometries/geometries.hpp              |    26 +
 include/ggl/geometries/latlong.hpp                 |    34 +
 include/ggl/geometries/linear_ring.hpp             |    58 +
 include/ggl/geometries/linestring.hpp              |    63 +
 include/ggl/geometries/nsphere.hpp                 |   130 +
 include/ggl/geometries/point.hpp                   |   143 +
 include/ggl/geometries/point_ll.hpp                |   130 +
 include/ggl/geometries/point_xy.hpp                |   109 +
 include/ggl/geometries/polygon.hpp                 |   171 +
 include/ggl/geometries/register/register_box.hpp   |   106 +
 include/ggl/geometries/register/register_point.hpp |   154 +
 include/ggl/geometries/segment.hpp                 |   105 +
 include/ggl/ggl.hpp                                |    73 +
 include/ggl/index/rtree/helpers.hpp                |    68 +
 include/ggl/index/rtree/rtree.hpp                  |   809 ++
 include/ggl/index/rtree/rtree_leaf.hpp             |   251 +
 include/ggl/index/rtree/rtree_node.hpp             |   487 +
 include/ggl/io/svg/write_svg.hpp                   |   270 +
 include/ggl/io/veshape/write_veshape.hpp           |   259 +
 include/ggl/io/wkb/detail/ogc.hpp                  |    82 +
 include/ggl/io/wkb/detail/parser.hpp               |   308 +
 include/ggl/io/wkb/read_wkb.hpp                    |   107 +
 include/ggl/io/wkb/utility.hpp                     |    89 +
 include/ggl/io/wkt/detail/wkt.hpp                  |    46 +
 include/ggl/io/wkt/read_wkt.hpp                    |   613 ++
 include/ggl/io/wkt/stream_wkt.hpp                  |    37 +
 include/ggl/io/wkt/write_wkt.hpp                   |   362 +
 include/ggl/iterators/base.hpp                     |    55 +
 include/ggl/iterators/circular_iterator.hpp        |    92 +
 include/ggl/iterators/ever_circling_iterator.hpp   |    86 +
 include/ggl/iterators/point_const_iterator.hpp     |    76 +
 include/ggl/iterators/section_iterators.hpp        |   217 +
 include/ggl/iterators/segment_iterator.hpp         |   139 +
 include/ggl/multi/algorithms/area.hpp              |    37 +
 include/ggl/multi/algorithms/centroid.hpp          |    81 +
 include/ggl/multi/algorithms/convex_hull.hpp       |    95 +
 include/ggl/multi/algorithms/correct.hpp           |    53 +
 .../algorithms/detail/modify_with_predicate.hpp    |    46 +
 include/ggl/multi/algorithms/detail/multi_sum.hpp  |    54 +
 include/ggl/multi/algorithms/distance.hpp          |   121 +
 include/ggl/multi/algorithms/envelope.hpp          |    98 +
 include/ggl/multi/algorithms/foreach.hpp           |   222 +
 include/ggl/multi/algorithms/intersection.hpp      |    43 +
 include/ggl/multi/algorithms/length.hpp            |    32 +
 include/ggl/multi/algorithms/num_points.hpp        |    78 +
 .../ggl/multi/algorithms/overlay/copy_segments.hpp |    92 +
 .../algorithms/overlay/get_intersection_points.hpp |    63 +
 include/ggl/multi/algorithms/perimeter.hpp         |    33 +
 include/ggl/multi/algorithms/remove_holes_if.hpp   |    43 +
 include/ggl/multi/algorithms/sectionalize.hpp      |   100 +
 include/ggl/multi/algorithms/simplify.hpp          |    69 +
 include/ggl/multi/algorithms/transform.hpp         |    87 +
 include/ggl/multi/algorithms/within.hpp            |   104 +
 include/ggl/multi/core/geometry_id.hpp             |    51 +
 include/ggl/multi/core/is_multi.hpp                |    49 +
 include/ggl/multi/core/point_type.hpp              |    59 +
 include/ggl/multi/core/ring_type.hpp               |    48 +
 include/ggl/multi/core/tags.hpp                    |    30 +
 include/ggl/multi/core/topological_dimension.hpp   |    45 +
 include/ggl/multi/geometries/multi_linestring.hpp  |    55 +
 include/ggl/multi/geometries/multi_point.hpp       |    54 +
 include/ggl/multi/geometries/multi_polygon.hpp     |    55 +
 include/ggl/multi/io/svg/write_svg.hpp             |    73 +
 include/ggl/multi/io/wkt/detail/wkt.hpp            |    52 +
 include/ggl/multi/io/wkt/read_wkt.hpp              |   104 +
 include/ggl/multi/io/wkt/write_wkt.hpp             |   108 +
 .../ggl/multi/iterators/point_const_iterator.hpp   |    50 +
 include/ggl/policies/relate/de9im.hpp              |   184 +
 include/ggl/policies/relate/direction.hpp          |   194 +
 .../ggl/policies/relate/intersection_points.hpp    |   143 +
 include/ggl/policies/relate/tupled.hpp             |   154 +
 include/ggl/projections/epsg.hpp                   |  3566 ++++++
 include/ggl/projections/epsg_traits.hpp            |    40 +
 include/ggl/projections/factory.hpp                |   242 +
 include/ggl/projections/impl/aasincos.hpp          |    93 +
 include/ggl/projections/impl/adjlon.hpp            |    65 +
 include/ggl/projections/impl/base_dynamic.hpp      |   105 +
 include/ggl/projections/impl/base_static.hpp       |   108 +
 include/ggl/projections/impl/factory_entry.hpp     |    38 +
 .../ggl/projections/impl/function_overloads.hpp    |    34 +
 include/ggl/projections/impl/geocent.c             |   454 +
 include/ggl/projections/impl/geocent.h             |   179 +
 include/ggl/projections/impl/pj_auth.hpp           |    82 +
 include/ggl/projections/impl/pj_datum_set.hpp      |   164 +
 include/ggl/projections/impl/pj_datums.hpp         |   103 +
 include/ggl/projections/impl/pj_ell_set.hpp        |   150 +
 include/ggl/projections/impl/pj_ellps.hpp          |    90 +
 include/ggl/projections/impl/pj_fwd.hpp            |    93 +
 include/ggl/projections/impl/pj_gauss.hpp          |   124 +
 include/ggl/projections/impl/pj_init.hpp           |   290 +
 include/ggl/projections/impl/pj_inv.hpp            |    72 +
 include/ggl/projections/impl/pj_mlfn.hpp           |   103 +
 include/ggl/projections/impl/pj_msfn.hpp           |    49 +
 include/ggl/projections/impl/pj_param.hpp          |   149 +
 include/ggl/projections/impl/pj_phi2.hpp           |    67 +
 include/ggl/projections/impl/pj_qsfn.hpp           |    80 +
 include/ggl/projections/impl/pj_transform.hpp      |   751 ++
 include/ggl/projections/impl/pj_tsfn.hpp           |    51 +
 include/ggl/projections/impl/pj_units.hpp          |    73 +
 include/ggl/projections/impl/pj_zpoly1.hpp         |    99 +
 include/ggl/projections/impl/proj_mdist.hpp        |   131 +
 include/ggl/projections/impl/projects.hpp          |   184 +
 include/ggl/projections/parameters.hpp             |    65 +
 include/ggl/projections/proj/aea.hpp               |   525 +
 include/ggl/projections/proj/aeqd.hpp              |   454 +
 include/ggl/projections/proj/airy.hpp              |   217 +
 include/ggl/projections/proj/aitoff.hpp            |   210 +
 include/ggl/projections/proj/august.hpp            |   141 +
 include/ggl/projections/proj/bacon.hpp             |   238 +
 include/ggl/projections/proj/bipc.hpp              |   253 +
 include/ggl/projections/proj/boggs.hpp             |   154 +
 include/ggl/projections/proj/bonne.hpp             |   246 +
 include/ggl/projections/proj/cass.hpp              |   465 +
 include/ggl/projections/proj/cc.hpp                |   145 +
 include/ggl/projections/proj/cea.hpp               |   224 +
 include/ggl/projections/proj/chamb.hpp             |   242 +
 include/ggl/projections/proj/collg.hpp             |   152 +
 include/ggl/projections/proj/crast.hpp             |   144 +
 include/ggl/projections/proj/denoy.hpp             |   140 +
 include/ggl/projections/proj/eck1.hpp              |   140 +
 include/ggl/projections/proj/eck2.hpp              |   151 +
 include/ggl/projections/proj/eck3.hpp              |   286 +
 include/ggl/projections/proj/eck4.hpp              |   167 +
 include/ggl/projections/proj/eck5.hpp              |   141 +
 include/ggl/projections/proj/eqc.hpp               |   146 +
 include/ggl/projections/proj/eqdc.hpp              |   212 +
 include/ggl/projections/proj/fahey.hpp             |   140 +
 include/ggl/projections/proj/fouc_s.hpp            |   167 +
 include/ggl/projections/proj/gall.hpp              |   142 +
 include/ggl/projections/proj/geocent.hpp           |   143 +
 include/ggl/projections/proj/geos.hpp              |   280 +
 include/ggl/projections/proj/gins8.hpp             |   140 +
 include/ggl/projections/proj/gn_sinu.hpp           |   380 +
 include/ggl/projections/proj/gnom.hpp              |   227 +
 include/ggl/projections/proj/goode.hpp             |   160 +
 include/ggl/projections/proj/gstmerc.hpp           |   169 +
 include/ggl/projections/proj/hammer.hpp            |   152 +
 include/ggl/projections/proj/hatano.hpp            |   173 +
 include/ggl/projections/proj/imw_p.hpp             |   281 +
 include/ggl/projections/proj/krovak.hpp            |   338 +
 include/ggl/projections/proj/labrd.hpp             |   231 +
 include/ggl/projections/proj/laea.hpp              |   391 +
 include/ggl/projections/proj/lagrng.hpp            |   158 +
 include/ggl/projections/proj/larr.hpp              |   134 +
 include/ggl/projections/proj/lask.hpp              |   148 +
 include/ggl/projections/proj/latlong.hpp           |   282 +
 include/ggl/projections/proj/lcc.hpp               |   247 +
 include/ggl/projections/proj/lcca.hpp              |   191 +
 include/ggl/projections/proj/loxim.hpp             |   164 +
 include/ggl/projections/proj/lsat.hpp              |   299 +
 include/ggl/projections/proj/mbt_fps.hpp           |   161 +
 include/ggl/projections/proj/mbtfpp.hpp            |   155 +
 include/ggl/projections/proj/mbtfpq.hpp            |   170 +
 include/ggl/projections/proj/merc.hpp              |   213 +
 include/ggl/projections/proj/mill.hpp              |   138 +
 include/ggl/projections/proj/mod_ster.hpp          |   474 +
 include/ggl/projections/proj/moll.hpp              |   262 +
 include/ggl/projections/proj/nell.hpp              |   154 +
 include/ggl/projections/proj/nell_h.hpp            |   153 +
 include/ggl/projections/proj/nocol.hpp             |   160 +
 include/ggl/projections/proj/nsper.hpp             |   317 +
 include/ggl/projections/proj/nzmg.hpp              |   197 +
 include/ggl/projections/proj/ob_tran.hpp           |   318 +
 include/ggl/projections/proj/ocea.hpp              |   189 +
 include/ggl/projections/proj/oea.hpp               |   181 +
 include/ggl/projections/proj/omerc.hpp             |   294 +
 include/ggl/projections/proj/ortho.hpp             |   219 +
 include/ggl/projections/proj/poly.hpp              |   266 +
 include/ggl/projections/proj/putp2.hpp             |   163 +
 include/ggl/projections/proj/putp3.hpp             |   197 +
 include/ggl/projections/proj/putp4p.hpp            |   201 +
 include/ggl/projections/proj/putp5.hpp             |   198 +
 include/ggl/projections/proj/putp6.hpp             |   223 +
 include/ggl/projections/proj/robin.hpp             |   232 +
 include/ggl/projections/proj/rouss.hpp             |   211 +
 include/ggl/projections/proj/rpoly.hpp             |   158 +
 include/ggl/projections/proj/sconics.hpp           |   511 +
 include/ggl/projections/proj/somerc.hpp            |   188 +
 include/ggl/projections/proj/stere.hpp             |   451 +
 include/ggl/projections/proj/sterea.hpp            |   381 +
 include/ggl/projections/proj/sts.hpp               |   294 +
 include/ggl/projections/proj/tcc.hpp               |   142 +
 include/ggl/projections/proj/tcea.hpp              |   149 +
 include/ggl/projections/proj/tmerc.hpp             |   458 +
 include/ggl/projections/proj/tpeqd.hpp             |   198 +
 include/ggl/projections/proj/urm5.hpp              |   149 +
 include/ggl/projections/proj/urmfps.hpp            |   205 +
 include/ggl/projections/proj/vandg.hpp             |   201 +
 include/ggl/projections/proj/vandg2.hpp            |   205 +
 include/ggl/projections/proj/vandg4.hpp            |   163 +
 include/ggl/projections/proj/wag2.hpp              |   144 +
 include/ggl/projections/proj/wag3.hpp              |   148 +
 include/ggl/projections/proj/wag7.hpp              |   137 +
 include/ggl/projections/proj/wink1.hpp             |   145 +
 include/ggl/projections/proj/wink2.hpp             |   159 +
 .../projections/project_inverse_transformer.hpp    |    73 +
 include/ggl/projections/project_transformer.hpp    |    59 +
 include/ggl/projections/projection.hpp             |    65 +
 .../ggl/strategies/agnostic/agn_convex_hull.hpp    |   278 +
 include/ggl/strategies/agnostic/agn_simplify.hpp   |   196 +
 include/ggl/strategies/agnostic/agn_within.hpp     |   162 +
 include/ggl/strategies/cartesian/cart_area.hpp     |    75 +
 include/ggl/strategies/cartesian/cart_centroid.hpp |   247 +
 include/ggl/strategies/cartesian/cart_compare.hpp  |    66 +
 include/ggl/strategies/cartesian/cart_distance.hpp |   228 +
 include/ggl/strategies/cartesian/cart_envelope.hpp |    64 +
 .../ggl/strategies/cartesian/cart_intersect.hpp    |   335 +
 include/ggl/strategies/cartesian/cart_side.hpp     |    71 +
 include/ggl/strategies/cartesian/cart_within.hpp   |   100 +
 include/ggl/strategies/distance_result.hpp         |   219 +
 include/ggl/strategies/geographic/geo_distance.hpp |   282 +
 include/ggl/strategies/geographic/geo_parse.hpp    |   266 +
 include/ggl/strategies/intersection_policies.hpp   |   373 +
 include/ggl/strategies/intersection_result.hpp     |   167 +
 include/ggl/strategies/spherical/sph_area.hpp      |   130 +
 include/ggl/strategies/spherical/sph_distance.hpp  |   255 +
 include/ggl/strategies/spherical/sph_envelope.hpp  |   176 +
 include/ggl/strategies/strategies.hpp              |    41 +
 include/ggl/strategies/strategy_traits.hpp         |   231 +
 include/ggl/strategies/strategy_transform.hpp      |   358 +
 .../strategies/transform/inverse_transformer.hpp   |    65 +
 .../ggl/strategies/transform/map_transformer.hpp   |   145 +
 .../strategies/transform/matrix_transformers.hpp   |   357 +
 include/ggl/util/as_range.hpp                      |    92 +
 include/ggl/util/assign_box_corner.hpp             |    59 +
 include/ggl/util/builder.hpp                       |   330 +
 include/ggl/util/copy.hpp                          |    76 +
 include/ggl/util/for_each_coordinate.hpp           |    64 +
 include/ggl/util/graticule.hpp                     |   231 +
 include/ggl/util/loop.hpp                          |    85 +
 include/ggl/util/math.hpp                          |    97 +
 include/ggl/util/promotion_traits.hpp              |    93 +
 interfaces/IImageManager.h                         |    99 +
 interfaces/IMapAdapter.h                           |   124 +
 .../MYahooBackground/MYahooBackground.pro          |    17 +
 .../MYahooBackground/MYahooBackground.qrc          |     5 +
 plugins/background/MYahooBackground/mapadapter.cpp |    87 +
 plugins/background/MYahooBackground/mapadapter.h   |   165 +
 .../MYahooBackground}/tilemapadapter.cpp           |     0
 .../background/MYahooBackground/tilemapadapter.h   |    72 +
 .../MYahooBackground/yahoolegalmapadapter.cpp      |    90 +
 .../MYahooBackground/yahoolegalmapadapter.h        |   130 +
 plugins/background/MYahooBackground/ymap.html      |   107 +
 plugins/background/background.pro                  |     6 +
 plugins/background/common.pri                      |     4 +
 plugins/common.pri                                 |    51 +
 plugins/plugins.pro                                |     3 +
 plugins/qtstyle/common.pri                         |     4 +
 plugins/qtstyle/qtstyle.pro                        |     3 +
 .../qtstyle}/skulpture/skulpture.cpp               |     0
 .../qtstyle}/skulpture/skulpture.h                 |     0
 .../qtstyle}/skulpture/skulpture_p.h               |     0
 .../qtstyle}/skulpture22/sk_effects.h              |     0
 plugins/qtstyle/skulpture22/sk_factory.h           |   165 +
 plugins/qtstyle/skulpture22/skulpture.cpp          | 10757 +++++++++++++++++++
 .../qtstyle}/skulpture22/skulpture.h               |     0
 plugins/qtstyle/skulpture22/skulpture22.pro        |    15 +
 .../qtstyle}/skulpture22/skulpture_p.h             |     0
 qextserialport/win_qextserialport.cpp              |   880 --
 share/BookmarksList.xml                            |    23 +
 share/Projections.xml                              |     7 +
 share/TmsServersList.xml                           |    14 +
 share/WmsServersList.xml                           |    17 +
 share/proj/GL27                                    |    22 +
 share/proj/epsg                                    |  7212 +++++++++++++
 share/proj/esri                                    |  5937 ++++++++++
 share/proj/esri.extra                              |   952 ++
 share/proj/nad.lst                                 |   142 +
 share/proj/nad27                                   |   809 ++
 share/proj/nad83                                   |   744 ++
 share/proj/other.extra                             |    49 +
 share/proj/proj_def.dat                            |    17 +
 share/proj/world                                   |   212 +
 share/share.qrc                                    |    13 +
 share/world_background.osb                         |   Bin 0 -> 915300 bytes
 src/AboutDialog.ui                                 |   207 +
 src/Command/Command.cpp                            |   492 +
 src/Command/Command.h                              |   108 +
 src/Command/DocumentCommands.cpp                   |   288 +
 src/Command/DocumentCommands.h                     |    60 +
 src/Command/FeatureCommands.cpp                    |   403 +
 src/Command/FeatureCommands.h                      |    91 +
 src/Command/RelationCommands.cpp                   |   254 +
 src/Command/RelationCommands.h                     |    64 +
 src/Command/RoadCommands.cpp                       |   224 +
 src/Command/RoadCommands.h                         |    58 +
 src/Command/TrackPointCommands.cpp                 |   116 +
 src/Command/TrackPointCommands.h                   |    34 +
 src/Command/TrackSegmentCommands.cpp               |   190 +
 src/Command/TrackSegmentCommands.h                 |    58 +
 src/Config.pri                                     |    18 +
 Custom.pri => src/Custom.pri                       |     0
 src/Docks/DirtyDock.cpp                            |   198 +
 src/Docks/DirtyDock.h                              |    57 +
 DirtyDock.ui => src/Docks/DirtyDock.ui             |     0
 src/Docks/Docks.pri                                |    22 +
 src/Docks/FeaturesDock.cpp                         |   347 +
 src/Docks/FeaturesDock.h                           |    77 +
 src/Docks/FeaturesDock.ui                          |    67 +
 src/Docks/InfoDock.cpp                             |    95 +
 src/Docks/InfoDock.h                               |    49 +
 src/Docks/LayerDock.cpp                            |   490 +
 src/Docks/MDockAncestor.cpp                        |    44 +
 {Utils => src/Docks}/MDockAncestor.h               |     0
 .../Docks/MinimumRelationProperties.ui             |     0
 .../Docks/MinimumRoadProperties.ui                 |     0
 .../Docks/MinimumTrackPointProperties.ui           |     0
 src/Docks/PropertiesDock.cpp                       |  1021 ++
 src/Docks/PropertiesDock.h                         |   124 +
 src/Docks/StyleDock.cpp                            |   103 +
 src/Docks/StyleDock.h                              |    49 +
 StyleDock.ui => src/Docks/StyleDock.ui             |     0
 DownloadMapDialog.ui => src/DownloadMapDialog.ui   |     0
 ExportDialog.ui => src/ExportDialog.ui             |     0
 src/GPS/GPS.pri                                    |    31 +
 src/GPS/SatelliteStrengthView.cpp                  |    51 +
 src/GPS/SatelliteStrengthView.h                    |    33 +
 src/GPS/qgps.cpp                                   |   224 +
 src/GPS/qgps.h                                     |    66 +
 src/GPS/qgpsdevice.cpp                             |  1117 ++
 src/GPS/qgpsdevice.h                               |   326 +
 {GPS => src/GPS}/qgpsmainwindowui.ui               |     0
 src/GPS/qgpssatellitetracker.cpp                   |   142 +
 src/GPS/qgpssatellitetracker.h                     |    49 +
 GeoImage.pri => src/GeoImage.pri                   |     0
 src/GeoImageDock.cpp                               |   599 ++
 src/GeoImageDock.h                                 |   113 +
 src/GotoDialog.cpp                                 |   204 +
 src/GotoDialog.h                                   |    57 +
 GotoDialog.ui => src/GotoDialog.ui                 |     0
 IProgressWindow.h => src/IProgressWindow.h         |     0
 ImportExport.pri => src/ImportExport.pri           |     0
 src/ImportExport/ExportGPX.cpp                     |   100 +
 {ImportExport => src/ImportExport}/ExportGPX.h     |     0
 src/ImportExport/IImportExport.cpp                 |    70 +
 src/ImportExport/IImportExport.h                   |    62 +
 src/ImportExport/ImportExportKML.cpp               |   321 +
 .../ImportExport}/ImportExportKML.h                |     0
 src/ImportExport/ImportExportOsmBin.cpp            |   779 ++
 src/ImportExport/ImportExportOsmBin.h              |   144 +
 src/ImportExport/ImportExportSHP.cpp               |   200 +
 src/ImportExport/ImportExportSHP.h                 |    48 +
 {ImportExport => src/ImportExport}/ImportNMEA.cpp  |     0
 {ImportExport => src/ImportExport}/ImportNMEA.h    |     0
 src/Interaction/CreateAreaInteraction.cpp          |   233 +
 src/Interaction/CreateAreaInteraction.h            |    44 +
 .../Interaction}/CreateDoubleWayDock.ui            |     0
 src/Interaction/CreateDoubleWayInteraction.cpp     |   254 +
 src/Interaction/CreateDoubleWayInteraction.h       |    42 +
 src/Interaction/CreateNodeInteraction.cpp          |    82 +
 src/Interaction/CreateNodeInteraction.h            |    19 +
 src/Interaction/CreatePolygonInteraction.cpp       |   206 +
 src/Interaction/CreatePolygonInteraction.h         |    37 +
 .../Interaction}/CreateRoundaboutDock.ui           |     0
 src/Interaction/CreateRoundaboutInteraction.cpp    |   184 +
 src/Interaction/CreateRoundaboutInteraction.h      |    36 +
 src/Interaction/CreateSingleWayInteraction.cpp     |   214 +
 src/Interaction/CreateSingleWayInteraction.h       |    41 +
 src/Interaction/EditInteraction.cpp                |   432 +
 src/Interaction/EditInteraction.h                  |    47 +
 src/Interaction/Interaction.cpp                    |   153 +
 src/Interaction/Interaction.h                      |   306 +
 src/Interaction/MoveTrackPointInteraction.cpp      |   222 +
 src/Interaction/MoveTrackPointInteraction.h        |    34 +
 src/Interaction/RotateInteraction.cpp              |   184 +
 src/Interaction/RotateInteraction.h                |    39 +
 src/Interaction/ZoomInteraction.cpp                |    83 +
 src/Interaction/ZoomInteraction.h                  |    31 +
 src/LayerDock.h                                    |    75 +
 src/LayerWidget.cpp                                |   531 +
 src/LayerWidget.h                                  |   166 +
 src/Main.cpp                                       |   209 +
 src/MainWindow.cpp                                 |  2742 +++++
 src/MainWindow.h                                   |   250 +
 src/MainWindow.ui                                  |  1571 +++
 src/MapView.cpp                                    |  1364 +++
 src/MapView.h                                      |   143 +
 src/Maps/Coord.cpp                                 |   145 +
 src/Maps/Coord.h                                   |   294 +
 src/Maps/DownloadOSM.cpp                           |   808 ++
 src/Maps/DownloadOSM.h                             |    84 +
 src/Maps/ExportOSM.cpp                             |   118 +
 src/Maps/ExportOSM.h                               |    19 +
 src/Maps/FeatureManipulations.cpp                  |   704 ++
 src/Maps/FeatureManipulations.h                    |    31 +
 src/Maps/ImageMapLayer.cpp                         |   516 +
 src/Maps/ImageMapLayer.h                           |    73 +
 src/Maps/ImportGPX.cpp                             |   311 +
 src/Maps/ImportGPX.h                               |    18 +
 src/Maps/ImportNGT.cpp                             |    46 +
 {Map => src/Maps}/ImportNGT.h                      |     0
 src/Maps/ImportOSM.cpp                             |   499 +
 {Map => src/Maps}/ImportOSM.h                      |     0
 src/Maps/LayerIterator.h                           |    70 +
 src/Maps/MapDocument.cpp                           |   810 ++
 src/Maps/MapDocument.h                             |   156 +
 src/Maps/MapFeature.cpp                            |   820 ++
 src/Maps/MapFeature.h                              |   292 +
 src/Maps/MapLayer.cpp                              |  1172 ++
 src/Maps/MapLayer.h                                |   283 +
 src/Maps/MapTypedef.h                              |    27 +
 src/Maps/Painting.cpp                              |   216 +
 src/Maps/Painting.h                                |    29 +
 src/Maps/Projection.cpp                            |   245 +
 src/Maps/Projection.h                              |    63 +
 src/Maps/Relation.cpp                              |   819 ++
 src/Maps/Relation.h                                |    72 +
 src/Maps/Road.cpp                                  |  1218 +++
 src/Maps/Road.h                                    |   127 +
 src/Maps/TrackPoint.cpp                            |   536 +
 src/Maps/TrackPoint.h                              |   144 +
 src/Maps/TrackSegment.cpp                          |   388 +
 src/Maps/TrackSegment.h                            |    71 +
 src/Merkaartor.pri                                 |   168 +
 MultiProperties.ui => src/MultiProperties.ui       |     0
 {NameFinder => src/NameFinder}/NameFinder.pri      |     0
 {NameFinder => src/NameFinder}/NameFinderResult.h  |     0
 src/NameFinder/httpquery.cpp                       |    88 +
 src/NameFinder/httpquery.h                         |    63 +
 .../NameFinder}/namefindertablemodel.cpp           |     0
 .../NameFinder}/namefindertablemodel.h             |     0
 src/NameFinder/namefinderwidget.cpp                |   145 +
 src/NameFinder/namefinderwidget.h                  |    83 +
 {NameFinder => src/NameFinder}/namefinderwidget.ui |     0
 {NameFinder => src/NameFinder}/xmlstreamreader.cpp |     0
 {NameFinder => src/NameFinder}/xmlstreamreader.h   |     0
 src/PaintStyle/EditPaintStyle.cpp                  |   389 +
 src/PaintStyle/EditPaintStyle.h                    |    95 +
 src/PaintStyle/PaintStyle.cpp                      |  1252 +++
 src/PaintStyle/PaintStyle.h                        |   198 +
 src/PaintStyle/PaintStyleEditor.cpp                |   585 +
 src/PaintStyle/PaintStyleEditor.h                  |    81 +
 {PaintStyle => src/PaintStyle}/PaintStyleEditor.ui |     0
 src/PaintStyle/TagSelector.cpp                     |   610 ++
 src/PaintStyle/TagSelector.h                       |   163 +
 src/Preferences/BookmarksList.cpp                  |   142 +
 src/Preferences/BookmarksList.h                    |    54 +
 src/Preferences/MerkaartorPreferences.cpp          |  1588 +++
 src/Preferences/MerkaartorPreferences.h            |   436 +
 src/Preferences/PreferencesDialog.cpp              |   509 +
 src/Preferences/PreferencesDialog.h                |    78 +
 src/Preferences/PreferencesDialog.ui               |  1467 +++
 src/Preferences/ProjectionsList.cpp                |   159 +
 src/Preferences/ProjectionsList.h                  |    48 +
 src/Preferences/TMSPreferencesDialog.cpp           |   143 +
 src/Preferences/TMSPreferencesDialog.h             |    61 +
 .../Preferences}/TMSPreferencesDialog.ui           |     0
 src/Preferences/TmsServersList.cpp                 |   148 +
 src/Preferences/TmsServersList.h                   |    56 +
 src/Preferences/WMSPreferencesDialog.cpp           |   347 +
 src/Preferences/WMSPreferencesDialog.h             |    69 +
 src/Preferences/WMSPreferencesDialog.ui            |   246 +
 src/Preferences/WmsServersList.cpp                 |   156 +
 src/Preferences/WmsServersList.h                   |    58 +
 src/QMapControl.pri                                |    18 +
 {QMapControl => src/QMapControl}/IImageManager.cpp |     0
 src/QMapControl/browserimagemanager.cpp            |   363 +
 src/QMapControl/browserimagemanager.h              |   145 +
 src/QMapControl/imagemanager.cpp                   |   151 +
 src/QMapControl/imagemanager.h                     |    89 +
 {QMapControl => src/QMapControl}/imagepoint.cpp    |     0
 {QMapControl => src/QMapControl}/imagepoint.h      |     0
 src/QMapControl/mapadapter.cpp                     |    87 +
 src/QMapControl/mapadapter.h                       |   165 +
 {QMapControl => src/QMapControl}/mapcontrol.cpp    |     0
 {QMapControl => src/QMapControl}/mapcontrol.h      |     0
 src/QMapControl/mapnetwork.cpp                     |   156 +
 src/QMapControl/mapnetwork.h                       |    76 +
 src/QMapControl/tilemapadapter.cpp                 |   186 +
 src/QMapControl/tilemapadapter.h                   |    84 +
 src/QMapControl/wmsmapadapter.cpp                  |    88 +
 src/QMapControl/wmsmapadapter.h                    |   130 +
 RelationProperties.ui => src/RelationProperties.ui |     0
 src/Render/NativeRenderDialog.cpp                  |   210 +
 src/Render/NativeRenderDialog.h                    |    53 +
 {Render => src/Render}/NativeRenderDialog.ui       |     0
 src/Render/Render.pri                              |    14 +
 src/Sync/DirtyList.cpp                             |   796 ++
 src/Sync/DirtyList.h                               |   157 +
 {Sync => src/Sync}/SyncListDialog.ui               |     0
 src/Sync/SyncOSM.cpp                               |    47 +
 src/Sync/SyncOSM.h                                 |    12 +
 src/TagModel.cpp                                   |   181 +
 src/TagModel.h                                     |    39 +
 src/TagTemplate/TagTemplate.cpp                    |  1107 ++
 {TagTemplate => src/TagTemplate}/TagTemplate.h     |     0
 {TagTemplate => src/TagTemplate}/TagTemplate.pri   |     0
 src/Tools/ActionsDialog.cpp                        |   161 +
 {Tools => src/Tools}/ActionsDialog.h               |     0
 {Tools => src/Tools}/RegionMapWidget.cpp           |     0
 {Tools => src/Tools}/RegionMapWidget.h             |     0
 {Tools => src/Tools}/Tools.pri                     |     0
 src/Tools/WorldOsbManager.cpp                      |   246 +
 {Tools => src/Tools}/WorldOsbManager.h             |     0
 {Tools => src/Tools}/WorldOsbManager.ui            |     0
 UploadMapDialog.ui => src/UploadMapDialog.ui       |     0
 src/Utils/EditCompleterDelegate.cpp                |   131 +
 {Utils => src/Utils}/EditCompleterDelegate.h       |     0
 src/Utils/LineF.h                                  |   305 +
 src/Utils/MDiscardableDialog.cpp                   |    79 +
 src/Utils/MDiscardableDialog.h                     |    34 +
 src/Utils/PictureViewerDialog.cpp                  |    51 +
 {Utils => src/Utils}/PictureViewerDialog.h         |     0
 {Utils => src/Utils}/PictureViewerDialog.ui        |     0
 {Utils => src/Utils}/PixmapWidget.cpp              |     0
 {Utils => src/Utils}/PixmapWidget.h                |     0
 src/Utils/SelectionDialog.cpp                      |    67 +
 {Utils => src/Utils}/SelectionDialog.h             |     0
 src/Utils/SelectionDialog.ui                       |   186 +
 {Utils => src/Utils}/ShortcutOverrideFilter.cpp    |     0
 {Utils => src/Utils}/ShortcutOverrideFilter.h      |     0
 src/Utils/SlippyMapWidget.cpp                      |   423 +
 src/Utils/SlippyMapWidget.h                        |    90 +
 src/Utils/SortAccordingToRenderingPriority.h       |    18 +
 src/Utils/SvgCache.cpp                             |    32 +
 src/Utils/SvgCache.h                               |     8 +
 src/Utils/Utils.qrc                                |     5 +
 merkaartor.desktop => src/merkaartor.desktop       |     0
 .../qextserialport}/posix_qextserialport.cpp       |     0
 .../qextserialport}/posix_qextserialport.h         |     0
 .../qextserialport}/qextserialbase.cpp             |     0
 .../qextserialport}/qextserialbase.h               |     0
 .../qextserialport}/qextserialport.cpp             |     0
 .../qextserialport}/qextserialport.h               |     0
 .../qextserialport}/qextserialport.pri             |     0
 src/qextserialport/win_qextserialport.cpp          |   880 ++
 .../qextserialport}/win_qextserialport.h           |     0
 src/src.pro                                        |   219 +
 {zlib => src/zlib}/uncompr.c                       |     0
 {zlib => src/zlib}/zconf.h                         |     0
 src/zlib/zlib.h                                    |  1357 +++
 translations/makefile                              |     2 +-
 translations/merkaartor_ar.ts                      |  2936 ++---
 translations/merkaartor_cs.ts                      |  2717 ++---
 translations/merkaartor_de.ts                      |  2745 ++---
 translations/merkaartor_es.ts                      |  3468 +++---
 translations/merkaartor_fr.ts                      |  2723 ++---
 translations/merkaartor_it.ts                      |  2721 ++---
 translations/merkaartor_ja.ts                      |  4946 +++++++++
 translations/merkaartor_nl.ts                      |  4934 +++++++++
 translations/merkaartor_pl.ts                      |  2707 ++---
 translations/merkaartor_ru.ts                      |  2832 ++---
 translations/merkaartor_sv.ts                      |  4960 +++++++++
 windows/Makefile                                   |     8 +-
 windows/defines.wxi                                |     8 +-
 windows/defines_dbg.wxi                            |     8 +-
 windows/merkaartor.wxs                             |    71 +-
 windows/merkaartor_dbg.wxs                         |    62 +-
 ymap.html                                          |   107 -
 zlib/zlib.h                                        |  1357 ---
 988 files changed, 164049 insertions(+), 113387 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/merkaartor.git

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to