This is an automated email from the git hooks/post-receive script. mira-guest pushed a commit to branch master in repository qmapshack.
commit 3b416e8401d7924f5eb366f11eb325e76bb4677c Merge: 554bf60 809ebf3 Author: Jaromír Mikeš <mira.mi...@seznam.cz> Date: Thu Oct 16 21:45:02 2014 +0200 Merge tag 'upstream/0.6.0' Upstream version 0.6.0 CMakeLists.txt | 2 +- CMakeLists.txt.user | 65 +-- changelog.txt | 7 + src/CMainWindow.cpp | 11 + src/CMakeLists.txt | 10 +- src/canvas/CCanvas.cpp | 20 +- src/canvas/CCanvas.h | 2 + src/cursors/cursorSelectRange.png | Bin 1357 -> 1419 bytes src/gis/CGisListWks.cpp | 32 +- src/gis/CGisListWks.h | 5 + src/gis/CGisWidget.cpp | 45 +++ src/gis/CGisWidget.h | 8 + src/gis/trk/CCombineTrk.cpp | 205 ++++++++++ src/gis/trk/{CScrOptTrk.h => CCombineTrk.h} | 41 +- src/gis/trk/CDetailsTrk.cpp | 4 +- src/gis/trk/CGisItemTrk.cpp | 437 ++++++++++++++++++--- src/gis/trk/CGisItemTrk.h | 60 ++- src/gis/trk/CScrOptTrk.cpp | 22 ++ src/gis/trk/CScrOptTrk.h | 3 + src/gis/trk/ICombineTrk.ui | 266 +++++++++++++ src/gis/trk/IScrOptTrk.ui | 61 ++- src/icons/32x32/Combine.png | Bin 0 -> 711 bytes src/icons/32x32/Left.png | Bin 0 -> 669 bytes src/icons/32x32/PointHide.png | Bin 0 -> 813 bytes src/icons/32x32/PointShow.png | Bin 0 -> 642 bytes src/icons/32x32/Reverse.png | Bin 0 -> 661 bytes src/icons/32x32/SelectRange.png | Bin 628 -> 831 bytes src/icons/48x48/Combine.png | Bin 0 -> 979 bytes src/icons/48x48/Left.png | Bin 0 -> 976 bytes src/icons/48x48/PointHide.png | Bin 0 -> 1175 bytes src/icons/48x48/PointShow.png | Bin 0 -> 869 bytes src/icons/48x48/Reverse.png | Bin 0 -> 1088 bytes src/icons/48x48/SelectRange.png | Bin 849 -> 1129 bytes src/icons/Combine.svg | 120 ++++++ src/icons/Left.svg | 94 +++++ src/icons/{SelectRange.svg => PointHide.svg} | 102 +++-- src/icons/{SelectRange.svg => PointShow.svg} | 79 ++-- src/icons/Reverse.svg | 76 ++++ src/icons/SelectRange.svg | 73 +++- src/locale/qmapshack_cs.ts | 231 ++++++++--- src/locale/qmapshack_de.ts | 405 ++++++++++++------- src/locale/qmapshack_es.ts | 231 ++++++++--- src/map/CMapWMTS.cpp | 2 +- src/mouse/CMouseEditArea.cpp | 10 +- src/mouse/CMouseEditArea.h | 2 + src/mouse/CMouseEditTrk.cpp | 9 +- src/mouse/CMouseEditTrk.h | 2 + src/mouse/CMouseRangeTrk.cpp | 275 +++++++++++++ .../trk/CScrOptTrk.h => mouse/CMouseRangeTrk.h} | 56 ++- src/mouse/{CMouseEditTrk.h => CScrOptRangeTrk.cpp} | 41 +- .../trk/CScrOptTrk.h => mouse/CScrOptRangeTrk.h} | 28 +- src/mouse/IMouseEditLine.cpp | 106 ++++- src/mouse/IMouseEditLine.h | 4 + src/mouse/IScrOptRangeTrk.ui | 116 ++++++ src/plot/CPlotTrack.cpp | 68 +++- src/plot/CPlotTrack.h | 3 + src/resources.qrc | 10 + 57 files changed, 2874 insertions(+), 575 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