This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository qmapshack.
commit b527697a7cb13a26737826d0577ff96c9ce28808
Merge: 2fd0001 c7e12fc
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Wed Jan 28 08:44:31 2015 +0100
Merge tag 'upstream/0.12.0'
Upstream version 0.12.0
CMakeLists.txt | 2 +-
CMakeLists.txt.user | 2 +-
CMakeLists.txt.user.3.2-pre1 | 288 -------------
changelog.txt | 6 +
src/CMakeLists.txt | 53 ++-
src/device/CDeviceGarmin.cpp | 138 ++++++
.../gpx/CGpxProject.h => device/CDeviceGarmin.h} | 38 +-
.../gpx/CGpxProject.h => device/CDeviceTwoNav.cpp} | 42 +-
.../gpx/CGpxProject.h => device/CDeviceTwoNav.h} | 34 +-
src/device/CDeviceWatcherLinux.cpp | 185 ++++++++
.../CGpxProject.h => device/CDeviceWatcherLinux.h} | 36 +-
.../CDeviceWatcherWindows.cpp} | 45 +-
.../CDeviceWatcherWindows.h} | 36 +-
src/device/IDevice.cpp | 216 ++++++++++
src/device/IDevice.h | 67 +++
src/device/IDeviceWatcher.cpp | 65 +++
src/device/IDeviceWatcher.h | 62 +++
src/gis/CGisListWks.cpp | 155 ++++++-
src/gis/CGisListWks.h | 9 +-
src/gis/CGisWidget.cpp | 114 +++--
src/gis/IGisItem.cpp | 16 +-
src/gis/IGisItem.h | 12 +-
src/gis/IGisWidget.ui | 127 +++---
src/gis/gpx/CGpxProject.cpp | 104 ++++-
src/gis/gpx/CGpxProject.h | 9 +-
src/gis/gpx/serialization.cpp | 73 +++-
src/gis/ovl/CGisItemOvlArea.cpp | 1 +
src/gis/ovl/CScrOptOvlArea.cpp | 2 +-
src/gis/prj/IGisProject.cpp | 77 +++-
src/gis/prj/IGisProject.h | 55 ++-
src/gis/rte/CGisItemRte.cpp | 1 +
src/gis/trk/CGisItemTrk.cpp | 4 +-
src/gis/trk/CScrOptTrk.cpp | 8 +-
src/gis/wpt/CGisItemWpt.cpp | 1 +
src/gis/wpt/CScrOptWpt.cpp | 4 +-
src/gis/wpt/IDetailsGeoCache.ui | 3 -
src/helpers/CPhotoAlbum.cpp | 2 +-
src/helpers/CPhotoViewer.cpp | 3 -
src/helpers/CPhotoViewer.h | 1 -
src/helpers/CSelectCopyAction.cpp | 22 +
src/helpers/CSelectCopyAction.h | 2 +
src/icons/32x32/Device.png | Bin 0 -> 604 bytes
src/icons/48x48/Device.png | Bin 0 -> 825 bytes
src/icons/Device.svg | 177 ++++++++
src/locale/qmapshack_cs.ts | 328 ++++++++-------
src/locale/qmapshack_de.ts | 464 +++++++++++----------
src/locale/qmapshack_es.ts | 268 ++++++------
src/main.cpp | 6 +
src/qlgt/converter.cpp | 2 +-
src/resources.qrc | 2 +
50 files changed, 2250 insertions(+), 1117 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
