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

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

commit f1dbf4d5b3623827d62a7b86199d2cd0b8989da0
Merge: 6948089 3db9961
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Thu Dec 25 16:46:08 2014 +0100

    Merge tag 'upstream/0.9.0'
    
    Upstream version 0.9.0

 .hg_archival.txt                                   |    4 -
 .hgtags                                            |   19 -
 CMakeLists.txt                                     |    7 +-
 CMakeLists.txt.user                                |  241 +++
 CMakeLists.txt.user.3.2-pre1                       |  288 +++
 changelog.txt                                      |    6 +
 src/CMainWindow.cpp                                |   21 +-
 src/CMainWindow.h                                  |    3 +-
 src/CMakeLists.txt                                 |   37 +-
 src/IMainWindow.ui                                 |   31 +-
 src/canvas/CCanvas.cpp                             |    6 +
 src/canvas/CCanvas.h                               |    1 +
 src/dem/IDemPathSetup.ui                           |  121 +-
 src/gis/CGisListDB.cpp                             |  370 ++--
 src/gis/CGisListDB.h                               |   36 +-
 src/gis/CGisListWks.cpp                            |  362 +++-
 src/gis/CGisListWks.h                              |   14 +-
 src/gis/CGisWidget.cpp                             |   41 +-
 src/gis/CGisWidget.h                               |   89 +-
 src/gis/IGisItem.cpp                               |   28 +-
 src/gis/IGisItem.h                                 |   19 +-
 src/gis/IGisWidget.ui                              |   55 +-
 src/gis/db/CDBFolderDatabase.cpp                   |   28 +-
 src/gis/db/CDBFolderDatabase.h                     |   15 +-
 src/gis/db/CDBFolderGroup.cpp                      |    8 +-
 src/gis/db/CDBFolderGroup.h                        |    2 +-
 src/gis/db/CDBFolderLostFound.cpp                  |   53 +-
 src/gis/db/CDBFolderLostFound.h                    |    6 +-
 src/gis/db/CDBFolderOther.cpp                      |    8 +-
 src/gis/db/CDBFolderOther.h                        |    2 +-
 src/gis/db/CDBFolderProject.cpp                    |   10 +-
 src/gis/db/CDBFolderProject.h                      |    2 +-
 src/gis/db/CDBItem.cpp                             |   51 +-
 src/gis/db/CDBItem.h                               |   15 +-
 src/gis/db/CDBProject.cpp                          |  296 ++-
 src/gis/db/CDBProject.h                            |   51 +
 src/gis/db/CSetupDatabase.cpp                      |  128 ++
 src/gis/db/{CSetupDB.h => CSetupDatabase.h}        |   25 +-
 src/gis/db/{CSetupDB.cpp => CSetupWorkspace.cpp}   |   21 +-
 src/gis/db/{CSetupDB.h => CSetupWorkspace.h}       |   17 +-
 src/gis/db/IDB.cpp                                 |  178 ++
 src/gis/db/{CDBFolderGroup.h => IDB.h}             |   21 +-
 src/gis/db/IDBFolder.cpp                           |  318 ++-
 src/gis/db/IDBFolder.h                             |   33 +-
 src/gis/db/{ISetupDB.ui => ISetupDatabase.ui}      |  103 +-
 src/gis/db/{ISetupDB.ui => ISetupWorkspace.ui}     |   65 +-
 src/gis/gpx/serialization.cpp                      |   12 -
 src/gis/ovl/CGisItemOvlArea.cpp                    |   14 +-
 src/gis/ovl/CGisItemOvlArea.h                      |    3 +
 src/gis/ovl/CScrOptOvlArea.cpp                     |    2 +
 src/gis/ovl/IDetailsOvlArea.ui                     |    7 +
 src/gis/prj/CDetailsPrj.cpp                        |    2 +-
 src/gis/prj/IDetailsPrj.ui                         |    7 +
 src/gis/prj/IGisProject.cpp                        |   53 +-
 src/gis/prj/IGisProject.h                          |    3 +-
 src/gis/qms/CQmsProject.cpp                        |    2 +-
 src/gis/qms/serialization.cpp                      |  136 +-
 src/gis/rte/CGisItemRte.cpp                        |   32 +-
 src/gis/rte/CGisItemRte.h                          |   15 +-
 src/gis/rte/CScrOptRte.h                           |    2 +-
 src/gis/trk/CGisItemTrk.cpp                        |   25 +-
 src/gis/trk/CGisItemTrk.h                          |    4 +
 src/gis/trk/IScrOptTrk.ui                          |    6 +-
 src/gis/wpt/CGisItemWpt.cpp                        |   12 +-
 src/gis/wpt/CGisItemWpt.h                          |   14 +-
 src/gis/wpt/CScrOptWpt.cpp                         |    2 +-
 src/gis/wpt/IDetailsWpt.ui                         |    7 +
 src/gis/wpt/IProjWpt.ui                            |    7 +
 src/gis/wpt/IScrOptWpt.ui                          |    3 -
 src/helpers/CAppOpts.h                             |    2 +
 src/helpers/CSettings.h                            |    2 +-
 src/icons/32x32/DatabaseConvert.png                |  Bin 0 -> 1905 bytes
 src/icons/32x32/Empty.png                          |  Bin 0 -> 581 bytes
 src/icons/32x32/MimeDemVRT.png                     |  Bin 1219 -> 1237 bytes
 src/icons/32x32/MimeIMG.png                        |  Bin 1492 -> 1783 bytes
 src/icons/32x32/MimeJNX.png                        |  Bin 1500 -> 1781 bytes
 src/icons/32x32/MimeMAP.png                        |  Bin 1800 -> 1845 bytes
 src/icons/32x32/MimeRMAP.png                       |  Bin 1718 -> 1961 bytes
 src/icons/32x32/MimeTMS.png                        |  Bin 1259 -> 1353 bytes
 src/icons/32x32/MimeVRT.png                        |  Bin 1629 -> 1775 bytes
 src/icons/32x32/MimeWMTS.png                       |  Bin 1716 -> 1790 bytes
 src/icons/32x32/SearchGoogle.png                   |  Bin 1915 -> 1923 bytes
 src/icons/48x48/DatabaseConvert.png                |  Bin 0 -> 2840 bytes
 src/icons/48x48/Empty.png                          |  Bin 0 -> 861 bytes
 src/icons/48x48/MimeDemVRT.png                     |  Bin 1809 -> 1846 bytes
 src/icons/48x48/MimeIMG.png                        |  Bin 2388 -> 2824 bytes
 src/icons/48x48/MimeJNX.png                        |  Bin 2409 -> 2874 bytes
 src/icons/48x48/MimeMAP.png                        |  Bin 2882 -> 2903 bytes
 src/icons/48x48/MimeRMAP.png                       |  Bin 2704 -> 3105 bytes
 src/icons/48x48/MimeTMS.png                        |  Bin 2073 -> 2203 bytes
 src/icons/48x48/MimeVRT.png                        |  Bin 2565 -> 2839 bytes
 src/icons/48x48/MimeWMTS.png                       |  Bin 2952 -> 3014 bytes
 src/icons/48x48/SearchGoogle.png                   |  Bin 3068 -> 3119 bytes
 src/icons/DatabaseConvert.svg                      |  260 +++
 src/icons/Empty.svg                                |   73 +
 src/icons/MimeDemVRT.svg                           |   16 +-
 src/icons/MimeIMG.svg                              |   42 +-
 src/icons/MimeJNX.svg                              |   38 +-
 src/icons/MimeMAP.svg                              |   42 +-
 src/icons/MimeRMAP.svg                             |   42 +-
 src/icons/MimeTMS.svg                              |   26 +-
 src/icons/MimeVRT.svg                              |   12 +-
 src/icons/MimeWMTS.svg                             |   64 +-
 src/locale/qmapshack_cs.ts                         | 1170 ++++++++---
 src/locale/qmapshack_de.ts                         | 1092 +++++++---
 src/locale/qmapshack_es.ts                         | 2132 +++++++++++++-------
 src/main.cpp                                       |   10 +-
 src/map/IMapPathSetup.ui                           |  159 +-
 src/mouse/CMouseNormal.cpp                         |    9 +
 src/mouse/CMouseNormal.h                           |    1 +
 src/mouse/CScrOptUnclutter.cpp                     |   17 +-
 src/mouse/CScrOptUnclutter.h                       |    1 +
 src/mouse/IMouse.h                                 |    1 +
 src/qlgt/CImportDatabase.cpp                       |  117 ++
 .../rte/CScrOptRte.h => qlgt/CImportDatabase.h}    |   33 +-
 src/qlgt/CQlb.cpp                                  |  174 ++
 src/qlgt/CQlb.h                                    |   99 +
 src/qlgt/CQlgtDb.cpp                               |  757 +++++++
 src/qlgt/CQlgtDb.h                                 |   80 +
 src/qlgt/CQlgtDiary.cpp                            |  258 +++
 src/{gis/db/CSetupDB.h => qlgt/CQlgtDiary.h}       |   28 +-
 src/qlgt/CQlgtFolder.cpp                           |   74 +
 src/{gis/db/CSetupDB.h => qlgt/CQlgtFolder.h}      |   30 +-
 src/qlgt/CQlgtRoute.cpp                            |  270 +++
 src/{gis/db/IDBFolder.h => qlgt/CQlgtRoute.h}      |   58 +-
 src/qlgt/CQlgtTrack.cpp                            |  344 ++++
 src/qlgt/CQlgtTrack.h                              |  261 +++
 src/qlgt/CQlgtWpt.cpp                              |  374 ++++
 src/qlgt/CQlgtWpt.h                                |  114 ++
 src/qlgt/CQmsDb.cpp                                |  263 +++
 src/qlgt/CQmsDb.h                                  |   64 +
 src/qlgt/IImportDatabase.ui                        |  115 ++
 src/{gis/db/CDBItem.cpp => qlgt/IItem.cpp}         |    7 +-
 src/{gis/db/CSetupDB.h => qlgt/IItem.h}            |   35 +-
 src/qlgt/IQlgtOverlay.cpp                          |  195 ++
 src/{gis/rte/CScrOptRte.h => qlgt/IQlgtOverlay.h}  |   47 +-
 src/qlgt/converter.cpp                             |  267 +++
 src/resources.qrc                                  |    4 +
 138 files changed, 10673 insertions(+), 2231 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