[qmapshack] 02/04: Merge tag 'upstream/1.2.2'

[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 88efde8951ad9be6f6e91a1af8da2f501afb4ea5
Merge: 0c676ef 2afe739
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Apr 30 21:47:44 2015 +0200

    Merge tag 'upstream/1.2.2'
    
    Upstream version 1.2.2

 CMakeLists.txt                                     |   2 +-
 CMakeLists.txt.user                                |   2 +-
 changelog.txt                                      |   6 +
 src/CMainWindow.cpp                                |   9 +-
 src/CMakeLists.txt                                 |   4 +-
 src/canvas/CCanvas.cpp                             |  12 +-
 src/canvas/CCanvas.h                               |   1 +
 src/device/CDeviceTwoNav.cpp                       |  10 +
 src/device/IDevice.cpp                             |   4 +-
 src/device/IDevice.h                               |   2 +-
 src/gis/CGisListWks.cpp                            |  13 +
 src/gis/CGisListWks.h                              |   2 +
 src/gis/CGisWidget.cpp                             |  29 +-
 src/gis/CGisWidget.h                               |   9 +
 src/gis/IGisItem.h                                 |  24 +-
 src/gis/gpx/serialization.cpp                      |  24 ++
 src/gis/prj/CDetailsPrj.cpp                        |  50 +--
 src/gis/prj/CDetailsPrj.h                          |   2 +-
 src/gis/prj/IDetailsPrj.ui                         |  56 ++--
 src/gis/prj/IGisProject.cpp                        |  21 +-
 src/gis/prj/IGisProject.h                          |  14 +-
 src/gis/qms/serialization.cpp                      |   9 +-
 src/gis/trk/CGisItemTrk.cpp                        |   4 +-
 src/gis/wpt/CGisItemWpt.cpp                        | 344 ++++++++++++++++++++-
 src/gis/wpt/CGisItemWpt.h                          |  28 ++
 src/gis/wpt/CScrOptWpt.cpp                         |   7 +
 src/gis/wpt/CScrOptWpt.h                           |   1 +
 src/gis/wpt/IScrOptWpt.ui                          |  16 +-
 src/icons/32x32/Bubble.png                         | Bin 0 -> 697 bytes
 src/icons/32x32/MoveArrow.png                      | Bin 0 -> 742 bytes
 src/icons/32x32/SizeArrow.png                      | Bin 0 -> 663 bytes
 src/icons/48x48/Bubble.png                         | Bin 0 -> 909 bytes
 src/icons/48x48/MoveArrow.png                      | Bin 0 -> 933 bytes
 src/icons/48x48/SizeArrow.png                      | Bin 0 -> 807 bytes
 src/icons/Bubble.svg                               |  92 ++++++
 src/icons/MoveArrow.svg                            |  94 ++++++
 src/icons/SizeArrow.svg                            |  94 ++++++
 src/locale/qmapshack_cs.ts                         | 320 ++++++++++---------
 src/locale/qmapshack_de.ts                         | 268 +++++++++-------
 src/locale/qmapshack_es.ts                         | 230 ++++++++------
 src/locale/qmapshack_fr.ts                         | 230 ++++++++------
 src/mouse/CMouseNormal.cpp                         |   7 +-
 src/mouse/CMouseRangeTrk.h                         |   2 +-
 src/mouse/CMouseWptBubble.cpp                      |  88 ++++++
 .../wpt/CScrOptWpt.h => mouse/CMouseWptBubble.h}   |  37 +--
 src/resources.qrc                                  |   7 +
 src/units/CTimeZoneSetup.cpp                       |  20 +-
 src/units/ITimeZoneSetup.ui                        |  62 +++-
 src/units/IUnit.cpp                                |   3 +-
 src/units/IUnit.h                                  |   9 +-
 50 files changed, 1694 insertions(+), 574 deletions(-)

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