[qmapshack] 03/06: Merge tag 'upstream/1.0.1'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qmapshack.

commit 08ab076a1a986a6a1239d22b452cccae6beef8e5
Merge: 36fe966 3f103f3
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Mar 19 20:57:24 2015 +0100

    Merge tag 'upstream/1.0.1'
    
    Upstream version 1.0.1

 CMakeLists.txt                                     |   2 +-
 CMakeLists.txt.user                                |  12 +-
 ...sts.txt.user.18 => CMakeLists.txt.user.3.3-pre1 |  71 +----
 CPackConfig.cmake                                  |   2 +-
 changelog.txt                                      |   8 +
 nsi/QMapShack_Installer.nsi                        |   6 +-
 nsi/QMapShack_Installer32.nsi                      |   6 +-
 src/CMainWindow.cpp                                |  76 +++++-
 src/CMainWindow.h                                  |   2 +
 src/GeoMath.cpp                                    |  67 +++--
 src/IMainWindow.ui                                 |  29 +-
 src/canvas/CCanvas.cpp                             |  11 +-
 src/dem/CDemDraw.cpp                               |  39 ++-
 src/dem/CDemDraw.h                                 |   1 +
 src/dem/CDemVRT.cpp                                |   8 +-
 src/dem/IDem.cpp                                   |  16 +-
 src/device/CDeviceGarmin.cpp                       |  11 +
 src/gis/CGisListWks.cpp                            |  11 +-
 src/gis/IGisItem.cpp                               |  12 +-
 src/gis/ovl/CDetailsOvlArea.cpp                    |   6 +
 src/gis/ovl/CGisItemOvlArea.cpp                    |   4 +-
 src/gis/ovl/IScrOptOvlArea.ui                      |   3 +
 src/gis/prj/IGisProject.cpp                        |  33 ++-
 src/gis/prj/IGisProject.h                          |   7 +-
 src/gis/rte/IScrOptRte.ui                          |   3 +
 src/gis/trk/CDetailsTrk.cpp                        |   5 +
 src/gis/trk/CGisItemTrk.cpp                        |  14 +-
 src/gis/trk/IDetailsTrk.ui                         |   3 +
 src/gis/trk/IScrOptTrk.ui                          |   3 +
 src/gis/trk/filter/filter.cpp                      |   5 +-
 src/gis/wpt/CDetailsWpt.cpp                        |   6 +
 src/gis/wpt/IScrOptWpt.ui                          |   5 +-
 src/grid/CGrid.cpp                                 |   4 +-
 src/helpers/CHistoryListWidget.cpp                 |   7 +-
 src/helpers/CPhotoViewer.cpp                       |   4 +-
 src/helpers/Platform.h                             |   2 +-
 src/icons/32x32/Save.png                           | Bin 0 -> 364 bytes
 src/icons/48x48/Save.png                           | Bin 0 -> 422 bytes
 src/icons/Save.svg                                 | 108 ++++++++
 src/locale/qmapshack_cs.ts                         | 290 +++++++++++---------
 src/locale/qmapshack_de.ts                         | 302 ++++++++++++---------
 src/locale/qmapshack_es.ts                         | 290 +++++++++++---------
 src/locale/qmapshack_fr.ts                         | 290 +++++++++++---------
 src/map/CMapDraw.cpp                               |  39 ++-
 src/map/CMapDraw.h                                 |   2 +
 src/map/CMapIMG.cpp                                |  18 +-
 src/map/CMapJNX.cpp                                |   2 +-
 src/map/CMapRMAP.cpp                               |   8 +-
 src/map/CMapTMS.cpp                                |  10 +-
 src/map/CMapVRT.cpp                                |   2 +-
 src/map/IMap.cpp                                   |   6 +-
 src/mouse/CMouseMoveWpt.cpp                        |   4 +-
 src/mouse/IMouseEditLine.cpp                       |   2 +-
 src/plot/CPlotAxis.cpp                             |   8 +
 src/plot/CPlotAxis.h                               |  11 +-
 src/plot/CPlotAxisTime.cpp                         |  12 +-
 src/plot/CPlotDistance.cpp                         |   7 +
 src/plot/CPlotSpeed.cpp                            |   7 +
 src/plot/IPlot.cpp                                 |  58 +++-
 src/plot/IPlot.h                                   |   9 +
 src/resources.qrc                                  |   2 +
 61 files changed, 1276 insertions(+), 715 deletions(-)

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