[SCM] qgis branch, master, updated. upstream/2.0.1-13461-g552133f
Bas Couwenberg
sebastic at xs4all.nl
Fri Jan 17 15:28:26 UTC 2014
The following commit has been merged in the master branch:
commit 5494160999990f4757c0b2f70d9ab35066b3f904
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Fri Jan 17 15:44:16 2014 +0100
Update Origin to commit from release-2_0 branch.
diff --git a/debian/patches/sip-api-4.15.patch b/debian/patches/sip-api-4.15.patch
index d0cfee3..2aea510 100644
--- a/debian/patches/sip-api-4.15.patch
+++ b/debian/patches/sip-api-4.15.patch
@@ -1,8 +1,6 @@
Description: Support building with SIP 4.15
-Origin: http://hub.qgis.org/projects/quantum-gis/repository/revisions/641359d3cb70706f367014648cd961e905bca2dd
-Author: Christian Urich <christian.urich at gmail.com>
+Origin: https://github.com/qgis/QGIS/commit/349a4c974fab88fdda0d612dea8defe037ec50ba
Bug: http://hub.qgis.org/issues/8507
-
--- a/src/core/qgsmaplayerregistry.h
+++ b/src/core/qgsmaplayerregistry.h
@@ -239,6 +239,11 @@ class CORE_EXPORT QgsMapLayerRegistry :
--
The Quantum GIS in Debian project
More information about the Pkg-grass-devel
mailing list