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

[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 b18ed613ac527566d1d8d81dfe3732e31ef9a46f
Merge: 3cd5a9d e2d3f65
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Nov 22 18:48:10 2015 +0100

    Merge tag 'upstream/1.5.1'
    
    Upstream version 1.5.1

 CMakeLists.txt                    | 2 +-
 CMakeLists.txt.user               | 2 +-
 changelog.txt                     | 3 +++
 src/mouse/CMouseEditArea.cpp      | 2 +-
 src/mouse/CMouseEditRte.cpp       | 2 +-
 src/mouse/CMouseEditTrk.cpp       | 2 +-
 src/mouse/line/IMouseEditLine.cpp | 4 ++--
 src/mouse/line/IMouseEditLine.h   | 3 ++-
 8 files changed, 12 insertions(+), 8 deletions(-)

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