[qmapshack] 07/11: Merge tag 'upstream/0.8.2'

[Bas Couwenberg]

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

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

commit d1ccb9c138bbe66f3755bcef6a713cef0b749145
Merge: a598e46 dd602b9
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Dec 13 01:32:23 2014 +0100

    Merge tag 'upstream/0.8.2'
    
    Upstream version 0.8.2

 .hg_archival.txt                                |   4 +-
 .hgtags                                         |   1 +
 CMakeLists.txt                                  |   2 +-
 changelog.txt                                   |   7 +
 nsi/3rdparty.txt                                |   9 +-
 nsi/QMapShack_Installer32.nsi                   | 265 +++++++++++
 nsi/copyfiles.bat                               |   1 +
 nsi/{copyfiles.bat => copyfiles32.bat}          |  19 +-
 src/CMakeLists.txt                              |   7 +-
 src/canvas/CCanvas.cpp                          |   2 +-
 src/canvas/CCanvas.h                            |   4 +-
 src/gis/CGisListDB.cpp                          |   2 +-
 src/gis/CGisListWks.cpp                         | 587 ++++++++++++++----------
 src/gis/CGisListWks.h                           |   2 +
 src/gis/CGisWidget.cpp                          |  39 +-
 src/gis/CGisWidget.h                            |  27 +-
 src/gis/IGisItem.cpp                            |  71 ++-
 src/gis/IGisItem.h                              |  25 +-
 src/gis/db/CDBProject.h                         |   2 +-
 src/gis/gpx/CGpxProject.h                       |   2 +-
 src/gis/gpx/serialization.cpp                   |  18 +-
 src/gis/ovl/CGisItemOvlArea.cpp                 |  42 +-
 src/gis/ovl/CGisItemOvlArea.h                   |   6 +-
 src/gis/ovl/CScrOptOvlArea.cpp                  |   6 +-
 src/gis/ovl/CScrOptOvlArea.h                    |   4 +-
 src/gis/prj/CDetailsPrj.cpp                     | 122 +++++
 src/gis/{rte/CScrOptRte.h => prj/CDetailsPrj.h} |  31 +-
 src/gis/prj/IDetailsPrj.ui                      |  85 ++++
 src/gis/{ => prj}/IGisProject.cpp               |  88 +++-
 src/gis/{ => prj}/IGisProject.h                 |  26 +-
 src/gis/qms/CQmsProject.h                       |   2 +-
 src/gis/qms/serialization.cpp                   |  14 +-
 src/gis/rte/CGisItemRte.cpp                     |   9 +-
 src/gis/rte/CGisItemRte.h                       |   2 +-
 src/gis/rte/CScrOptRte.cpp                      |   4 +-
 src/gis/rte/CScrOptRte.h                        |   3 +-
 src/gis/search/CSearchGoogle.h                  |   2 +-
 src/gis/trk/CCombineTrk.cpp                     |  34 +-
 src/gis/trk/CCombineTrk.h                       |   5 +-
 src/gis/trk/CGisItemTrk.cpp                     |  15 +-
 src/gis/trk/CGisItemTrk.h                       |   4 +-
 src/gis/trk/CScrOptTrk.cpp                      |   3 +-
 src/gis/trk/CScrOptTrk.h                        |   3 +-
 src/gis/wpt/CGisItemWpt.cpp                     |   8 +-
 src/gis/wpt/CGisItemWpt.h                       |   2 +-
 src/gis/wpt/CProjWpt.cpp                        |   2 +-
 src/gis/wpt/CScrOptWpt.cpp                      |   5 +-
 src/gis/wpt/CScrOptWpt.h                        |   3 +-
 src/grid/CGrid.cpp                              |   7 +-
 src/helpers/CHistoryListWidget.cpp              |   1 +
 src/helpers/CHistoryListWidget.h                |   2 +-
 src/helpers/CSelectProjectDialog.cpp            |   2 +-
 src/mouse/CMouseEditArea.cpp                    |  14 +-
 src/mouse/CMouseEditArea.h                      |   4 +-
 src/mouse/CMouseEditTrk.cpp                     |  12 +-
 src/mouse/CMouseEditTrk.h                       |   3 +-
 src/mouse/CMouseMoveWpt.cpp                     |   8 +-
 src/mouse/CMouseMoveWpt.h                       |   3 +-
 src/mouse/CMouseNormal.cpp                      |  11 +-
 src/mouse/CMouseRangeTrk.cpp                    |  10 +-
 src/mouse/CMouseRangeTrk.h                      |   3 +-
 src/mouse/CScrOptUnclutter.cpp                  |   7 +-
 src/mouse/CScrOptUnclutter.h                    |   7 +-
 src/units/CUnitImperial.cpp                     |  15 +
 src/units/CUnitImperial.h                       |   1 +
 src/units/CUnitMetric.cpp                       |  14 +
 src/units/CUnitMetric.h                         |   1 +
 src/units/CUnitNautic.cpp                       |  15 +
 src/units/CUnitNautic.h                         |   1 +
 src/units/IUnit.h                               |   2 +
 70 files changed, 1317 insertions(+), 452 deletions(-)

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