[qlandkartegt] 02/16: Merge tag 'upstream/1.8.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository qlandkartegt.

commit fc85752f7b0ff93f2ef541673c3b154564c3963a
Merge: c3edf7c c73a64f
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Thu Feb 12 08:59:58 2015 +0100

    Merge tag 'upstream/1.8.0'
    
    Upstream version 1.8.0

 3rdparty/QDeviceWatcher/CMakeLists.txt             |  82 -----
 3rdparty/QDeviceWatcher/libQDeviceWatcher.pri      | 134 -------
 3rdparty/QDeviceWatcher/libQDeviceWatcher.pro      |  27 --
 3rdparty/QDeviceWatcher/qdevicechangeevent.cpp     |  29 --
 3rdparty/QDeviceWatcher/qdevicechangeevent.h       |  48 ---
 3rdparty/QDeviceWatcher/qdevicewatcher.cpp         |  94 -----
 3rdparty/QDeviceWatcher/qdevicewatcher.h           |  52 ---
 3rdparty/QDeviceWatcher/qdevicewatcher_global.h    |  31 --
 3rdparty/QDeviceWatcher/qdevicewatcher_linux.cpp   | 267 --------------
 3rdparty/QDeviceWatcher/qdevicewatcher_mac.cpp     |  76 ----
 3rdparty/QDeviceWatcher/qdevicewatcher_p.h         | 124 -------
 3rdparty/QDeviceWatcher/qdevicewatcher_win32.cpp   | 385 ---------------------
 3rdparty/QDeviceWatcher/qdevicewatcher_wince.cpp   | 137 --------
 CMakeLists.txt                                     |   5 +-
 CMakeLists.txt.user                                |  16 +-
 CMakeLists.txt.user => CMakeLists.txt.user.18      |  18 +-
 ...eLists.txt.user => CMakeLists.txt.user.3.2-pre1 |   2 +-
 changelog.txt                                      |  15 +
 nsi/3rdparty.txt                                   |   2 +-
 nsi/GTinstaller.nsi                                |   2 +-
 nsi/copyfiles.bat                                  |   6 +-
 src/CCanvas.cpp                                    |  35 +-
 src/CCanvas.h                                      |   1 +
 src/CDeviceGarminBulk.cpp                          |   8 +-
 src/CDlgConfig.cpp                                 |  85 +++++
 src/CDlgConfig.h                                   |   4 +
 src/CDlgEditWpt.cpp                                |  31 +-
 src/CGpx.cpp                                       |   6 +-
 src/CGpx.h                                         |  13 +-
 src/CMainWindow.cpp                                |   4 +-
 src/CMakeLists.txt                                 |   6 +-
 src/CMapTDB.cpp                                    |   2 +-
 src/CMouseMoveMap.cpp                              |   3 +
 src/CPlot.cpp                                      |  10 +-
 src/CPlot.h                                        |   3 +-
 src/CResources.cpp                                 |  44 +++
 src/CResources.h                                   |  12 +
 src/CRoute.cpp                                     |  63 +++-
 src/CRoute.h                                       |   9 +
 src/CRouteDB.cpp                                   |   1 +
 src/CRouteToolWidget.cpp                           | 107 +++++-
 src/CRouteToolWidget.h                             |   5 +-
 src/CTrack.cpp                                     |  50 ++-
 src/CTrackDB.cpp                                   |   4 +-
 src/CTrackEditWidget.cpp                           |  29 +-
 src/CWptDB.cpp                                     |   2 +-
 src/IDlgConfig.ui                                  | 164 +++++++++
 src/IGarminTyp.cpp                                 |   2 +-
 src/IGarminTyp.h                                   |   2 +-
 src/IRouteToolWidget.ui                            |  62 +++-
 src/ITrackEditWidget.ui                            |  12 +-
 src/locale/qlandkartegt_es_ES.ts                   | 108 +++---
 src/main.cpp                                       |   2 +-
 svn-commit.2.tmp                                   |   4 +
 54 files changed, 776 insertions(+), 1669 deletions(-)

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