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

mira-guest pushed a commit to branch master
in repository qmapshack.

commit 151f1e1189422747426b6002ebb401a78fdeb8a1
Merge: 055158e 77575ed
Author: Jaromír Mikeš <mira.mi...@seznam.cz>
Date:   Wed Oct 29 18:37:59 2014 +0100

    Merge tag 'upstream/0.7.0'
    
    Upstream version 0.7.0

 CMakeLists.txt                                     |   2 +-
 CMakeLists.txt.user                                |  65 ++-
 changelog.txt                                      |   5 +
 qmapshack.desktop                                  |   3 +-
 src/CMainWindow.cpp                                |   2 +-
 src/CMakeLists.txt                                 |  36 +-
 src/GeoMath.cpp                                    | 197 ++++++-
 src/GeoMath.h                                      |  18 +
 src/IMainWindow.ui                                 |  41 +-
 src/canvas/CCanvas.cpp                             |   7 +-
 src/canvas/CCanvas.h                               |  14 +
 src/canvas/IDrawObject.cpp                         |   2 +
 src/gis/CGisListWks.cpp                            | 100 +++-
 src/gis/CGisListWks.h                              |  16 +-
 src/gis/CGisSerialization.cpp                      | 215 ++++++++
 .../IDiskCache.cpp => gis/CGisSerialization.h}     |  17 +-
 src/gis/CGisWidget.cpp                             |  37 +-
 src/gis/CGisWidget.h                               |   6 +-
 src/gis/IGisItem.cpp                               |  12 +-
 src/gis/IGisItem.h                                 |  84 ++-
 src/gis/IGisProject.cpp                            | 193 +++++++
 src/gis/{CGisProject.h => IGisProject.h}           | 103 +---
 src/gis/IGisWidget.ui                              |   2 +-
 src/gis/{CGisProject.cpp => gpx/CGpxProject.cpp}   | 196 +------
 src/gis/{CGisProject.h => gpx/CGpxProject.h}       |  56 +-
 src/gis/ovl/CDetailsOvlArea.cpp                    |   8 +-
 src/gis/ovl/CGisItemOvlArea.cpp                    |   8 +-
 src/gis/ovl/CGisItemOvlArea.h                      |   8 +-
 src/gis/ovl/IDetailsOvlArea.ui                     |   8 +-
 src/gis/rte/CGisItemRte.cpp                        |   6 +-
 src/gis/rte/CGisItemRte.h                          |   6 +-
 src/gis/search/CSearchGoogle.cpp                   | 172 +++++++
 .../search/CSearchGoogle.h}                        |  31 +-
 src/gis/trk/CCombineTrk.cpp                        |   4 +-
 src/gis/trk/CCombineTrk.h                          |   6 +-
 src/gis/trk/CDetailsTrk.cpp                        |  76 ++-
 src/gis/trk/CDetailsTrk.h                          |   2 +
 src/gis/trk/CGisItemTrk.cpp                        |  72 ++-
 src/gis/trk/CGisItemTrk.h                          |  70 ++-
 src/gis/trk/IDetailsTrk.ui                         | 329 +++++++-----
 src/gis/wpt/CDetailsWpt.cpp                        |   8 +-
 src/gis/wpt/CGisItemWpt.cpp                        |  10 +-
 src/gis/wpt/CGisItemWpt.h                          |  11 +-
 src/gis/wpt/CProjWpt.cpp                           |   4 +-
 src/gis/wpt/IDetailsWpt.ui                         |  10 +-
 src/helpers/CSelectProjectDialog.cpp               |   4 +-
 src/helpers/CWptIconDialog.cpp                     |  32 +-
 src/helpers/CWptIconDialog.h                       |   7 +-
 src/helpers/ITextEditWidget.ui                     |   4 +-
 src/icons/32x32/AddProject.png                     | Bin 0 -> 1234 bytes
 src/icons/32x32/Error.png                          | Bin 0 -> 1130 bytes
 src/icons/32x32/MimeTMS.png                        | Bin 0 -> 1259 bytes
 src/icons/32x32/SearchGoogle.png                   | Bin 0 -> 1915 bytes
 src/icons/48x48/AddProject.png                     | Bin 0 -> 1713 bytes
 src/icons/48x48/Error.png                          | Bin 0 -> 1863 bytes
 src/icons/48x48/MimeTMS.png                        | Bin 0 -> 2073 bytes
 src/icons/48x48/SearchGoogle.png                   | Bin 0 -> 3068 bytes
 src/icons/AddProject.svg                           | 106 ++++
 src/icons/Error.svg                                |  79 +++
 src/icons/MimeTMS.svg                              |  98 ++++
 src/icons/SearchGoogle.svg                         |  73 +++
 src/locale/qmapshack_cs.ts                         | 566 ++++++++++++---------
 src/locale/qmapshack_de.ts                         | 412 +++++++++------
 src/locale/qmapshack_es.ts                         | 372 +++++++++-----
 src/map/CMapDraw.cpp                               |  52 +-
 src/map/CMapDraw.h                                 |  14 +
 src/map/CMapIMG.cpp                                | 112 +++-
 src/map/CMapIMG.h                                  |  15 +
 src/map/CMapItem.cpp                               |  12 +
 src/map/CMapJNX.cpp                                |   3 +-
 src/map/CMapTMS.cpp                                | 501 ++++++++++++++++++
 src/map/{CMapWMTS.h => CMapTMS.h}                  |  79 ++-
 src/map/CMapWMTS.cpp                               |  77 ++-
 src/map/CMapWMTS.h                                 |   9 +
 src/map/IMap.cpp                                   |   9 +
 src/map/IMap.h                                     |  21 +
 src/map/{wmts => cache}/CDiskCache.cpp             |  19 +-
 src/map/{wmts => cache}/CDiskCache.h               |   2 +-
 src/map/{wmts => cache}/IDiskCache.cpp             |   0
 src/map/{wmts => cache}/IDiskCache.h               |   0
 src/map/garmin/CGarminPolygon.cpp                  |  38 +-
 src/map/garmin/CGarminPolygon.h                    |   7 +-
 src/mouse/CMouseEditArea.cpp                       |  16 +-
 src/mouse/CMouseEditArea.h                         |   2 +
 src/mouse/CMouseEditTrk.cpp                        |  21 +-
 src/mouse/CMouseEditTrk.h                          |   5 +-
 src/mouse/CMouseNormal.cpp                         |   4 +-
 src/mouse/CScrOptUnclutter.cpp                     |  78 ++-
 src/mouse/CScrOptUnclutter.h                       |   2 +-
 src/mouse/IMouse.cpp                               |   1 +
 src/mouse/IMouse.h                                 |   6 +-
 src/mouse/IMouseEditLine.cpp                       | 152 +++++-
 src/mouse/IMouseEditLine.h                         |  10 +-
 src/plot/CPlotDistance.cpp                         |   2 +-
 src/plot/CPlotProfile.cpp                          |   2 +-
 src/plot/CPlotSpeed.cpp                            |   2 +-
 src/plot/CPlotTrack.cpp                            |   2 +-
 src/resources.qrc                                  |   8 +
 98 files changed, 3973 insertions(+), 1341 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/qmapshack.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