[QGIS Commit] [qgis/Quantum-GIS] 83d2a7: Merge branch 'master' of
github.com:timlinux/Quant...
noreply at github.com
noreply at github.com
Mon Oct 31 17:33:09 EDT 2011
Branch: refs/heads/master
Home: https://github.com/qgis/Quantum-GIS
Commit: 83d2a71fbfb6adc39447a2d8b2c2785ddc3ef576
https://github.com/qgis/Quantum-GIS/commit/83d2a71fbfb6adc39447a2d8b2c2785ddc3ef576
Author: Tim Sutton <tim at linfiniti.com>
Date: 2011-10-31 (Mon, 31 Oct 2011)
Changed paths:
A scripts/make-tarball.sh
Log Message:
-----------
Merge branch 'master' of github.com:timlinux/Quantum-GIS
Commit: e9ee865f78aae8ceb7b8a7a20d43abdcbc429327
https://github.com/qgis/Quantum-GIS/commit/e9ee865f78aae8ceb7b8a7a20d43abdcbc429327
Author: Tim Sutton <tim at linfiniti.com>
Date: 2011-10-31 (Mon, 31 Oct 2011)
Changed paths:
M src/app/qgisapp.cpp
Log Message:
-----------
[BACKPORT] apply fix to invalid reference to trac #4440
Commit: 900011bbeef213eecdee7dba56baadc2a02089d9
https://github.com/qgis/Quantum-GIS/commit/900011bbeef213eecdee7dba56baadc2a02089d9
Author: Tim Sutton <tim at linfiniti.com>
Date: 2011-10-31 (Mon, 31 Oct 2011)
Changed paths:
M debian/changelog
M debian/qgis.install
M src/app/CMakeLists.txt
M src/app/legend/qgslegend.cpp
M src/app/qgisapp.cpp
M src/app/qgsoptions.cpp
R src/app/spatialite/qgsspatialitesourceselect.cpp
R src/app/spatialite/qgsspatialitesourceselect.h
R src/app/spatialite/qgsspatialitetablemodel.cpp
R src/app/spatialite/qgsspatialitetablemodel.h
M src/core/CMakeLists.txt
M src/core/qgscoordinatereferencesystem.cpp
M src/core/qgsdataitem.h
M src/core/qgspallabeling.cpp
M src/core/qgsscalecalculator.cpp
A src/core/symbology-ng/qgspointdisplacementrenderer.cpp
A src/core/symbology-ng/qgspointdisplacementrenderer.h
M src/core/symbology-ng/qgsrendererv2registry.cpp
M src/gui/CMakeLists.txt
M src/gui/qgsexpressionbuilderwidget.cpp
M src/gui/qgsexpressionbuilderwidget.h
A src/gui/symbology-ng/qgspointdisplacementrendererwidget.cpp
A src/gui/symbology-ng/qgspointdisplacementrendererwidget.h
M src/gui/symbology-ng/qgsrendererv2propertiesdialog.cpp
M src/plugins/CMakeLists.txt
M src/plugins/georeferencer/qgsopenrasterdialog.cpp
R src/plugins/point_displacement_renderer/CMakeLists.txt
R src/plugins/point_displacement_renderer/qgsdisplacementplugin.cpp
R src/plugins/point_displacement_renderer/qgsdisplacementplugin.h
R src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.cpp
R src/plugins/point_displacement_renderer/qgspointdisplacementrenderer.h
R src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.cpp
R src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidget.h
R src/plugins/point_displacement_renderer/qgspointdisplacementrendererwidgetbase.ui
M src/providers/postgres/qgspostgresprovider.cpp
M src/providers/spatialite/CMakeLists.txt
A src/providers/spatialite/qgsspatialiteconnection.cpp
A src/providers/spatialite/qgsspatialiteconnection.h
A src/providers/spatialite/qgsspatialitedataitems.cpp
A src/providers/spatialite/qgsspatialitedataitems.h
A src/providers/spatialite/qgsspatialitesourceselect.cpp
A src/providers/spatialite/qgsspatialitesourceselect.h
A src/providers/spatialite/qgsspatialitetablemodel.cpp
A src/providers/spatialite/qgsspatialitetablemodel.h
M src/python/qgspythonutilsimpl.cpp
A src/ui/qgspointdisplacementrendererwidgetbase.ui
Log Message:
-----------
Merge branch 'master' of github.com:qgis/Quantum-GIS
Compare: https://github.com/qgis/Quantum-GIS/compare/50f20c2...900011b
More information about the QGIS-commit
mailing list