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

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

commit 50989c6e6518234f4f6bf6291fa0c2718053f639
Merge: 807a60c b27f763
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Jan 2 12:48:45 2015 +0100

    Merge tag 'upstream/0.9.1'
    
    Upstream version 0.9.1

 CMakeLists.txt                                     |   2 +-
 CMakeLists.txt.user                                |   6 +-
 changelog.txt                                      |   5 +
 nsi/QMapShack_Installer.nsi                        |   7 +-
 nsi/QMapShack_Installer32.nsi                      |   7 +-
 nsi/copyfiles.bat                                  |   9 +-
 nsi/copyfiles32.bat                                |   9 +-
 src/CMakeLists.txt                                 |   5 +
 src/gis/CGisListDB.cpp                             | 132 ++++-
 src/gis/CGisListDB.h                               |  15 +
 src/gis/CGisListWks.cpp                            | 316 +++++-----
 src/gis/CGisListWks.h                              |  13 +
 src/gis/CGisWidget.cpp                             | 102 ++--
 src/gis/CGisWidget.h                               |  23 +-
 src/gis/IGisItem.cpp                               |  15 +-
 src/gis/IGisItem.h                                 |  14 +-
 src/gis/IGisWidget.ui                              |   9 +-
 src/gis/db/CDBFolderDatabase.cpp                   |   7 +-
 src/gis/db/CDBFolderGroup.cpp                      |   4 +-
 src/gis/db/CDBFolderLostFound.cpp                  |  66 ++-
 src/gis/db/CDBFolderLostFound.h                    |   6 +
 src/gis/db/CDBFolderOther.cpp                      |   5 +-
 src/gis/db/CDBFolderProject.cpp                    |   5 +-
 src/gis/db/CDBItem.cpp                             |  31 +-
 src/gis/db/CDBItem.h                               |   4 +-
 src/gis/db/CDBProject.cpp                          |  20 +-
 src/gis/db/CDBProject.h                            |   2 +-
 src/gis/db/CLostFoundProject.cpp                   |  83 +++
 .../{CDBFolderLostFound.h => CLostFoundProject.h}  |  23 +-
 src/gis/db/IDBFolder.cpp                           |  38 +-
 src/gis/db/IDBFolder.h                             |   9 +-
 src/gis/gpx/CGpxProject.cpp                        |   6 +-
 src/gis/ovl/CGisItemOvlArea.cpp                    |  19 +-
 src/gis/ovl/CGisItemOvlArea.h                      |   6 +-
 src/gis/ovl/CScrOptOvlArea.cpp                     |   8 +
 src/gis/ovl/CScrOptOvlArea.h                       |   1 +
 src/gis/ovl/IScrOptOvlArea.ui                      |  14 +
 src/gis/prj/IGisProject.cpp                        | 112 +++-
 src/gis/prj/IGisProject.h                          |  39 +-
 src/gis/qms/CQmsProject.cpp                        |   7 +-
 src/gis/qms/serialization.cpp                      |  17 +-
 src/gis/rte/CGisItemRte.cpp                        |  14 +-
 src/gis/rte/CGisItemRte.h                          |   6 +-
 src/gis/rte/CScrOptRte.cpp                         |   6 +
 src/gis/rte/CScrOptRte.h                           |   1 +
 src/gis/rte/IScrOptRte.ui                          |  14 +
 src/gis/search/CSearchGoogle.cpp                   |  12 +-
 src/gis/trk/CDetailsTrk.cpp                        |   2 +
 src/gis/trk/CGisItemTrk.cpp                        |  18 +-
 src/gis/trk/CGisItemTrk.h                          |  10 +-
 src/gis/trk/CScrOptTrk.cpp                         |   7 +
 src/gis/trk/CScrOptTrk.h                           |   1 +
 src/gis/trk/IScrOptTrk.ui                          |  26 +-
 src/gis/wpt/CGisItemWpt.cpp                        |  14 +-
 src/gis/wpt/CGisItemWpt.h                          |   6 +-
 src/gis/wpt/CScrOptWpt.cpp                         |   7 +
 src/gis/wpt/CScrOptWpt.h                           |   1 +
 src/gis/wpt/IScrOptWpt.ui                          |  14 +
 src/helpers/CHistoryListWidget.cpp                 |   4 +-
 src/helpers/CSelectCopyAction.cpp                  |  68 +++
 .../CSelectCopyAction.h}                           |  40 +-
 src/helpers/CSelectProjectDialog.cpp               |   4 +-
 src/helpers/ISelectCopyAction.ui                   | 140 +++++
 src/icons/32x32/Copy.png                           | Bin 415 -> 511 bytes
 src/icons/32x32/DatabaseConvert.png                | Bin 1905 -> 1554 bytes
 src/icons/32x32/Move.png                           | Bin 0 -> 869 bytes
 src/icons/48x48/Copy.png                           | Bin 517 -> 649 bytes
 src/icons/48x48/DatabaseConvert.png                | Bin 2840 -> 2617 bytes
 src/icons/48x48/Move.png                           | Bin 0 -> 1126 bytes
 src/icons/Copy.svg                                 |  32 +-
 src/icons/DatabaseConvert.svg                      |  53 +-
 src/icons/{Copy.svg => Move.svg}                   |  49 +-
 src/locale/qmapshack_cs.ts                         | 396 ++++++++-----
 src/locale/qmapshack_de.ts                         | 637 +++++++++++++--------
 src/locale/qmapshack_es.ts                         | 398 ++++++++-----
 src/mouse/CMouseNormal.cpp                         |  16 +
 src/mouse/CMouseNormal.h                           |   3 +
 src/mouse/CScrOptUnclutter.cpp                     |   1 +
 src/resources.qrc                                  |   2 +
 79 files changed, 2198 insertions(+), 1025 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

Reply via email to