[QGIS Commit] [qgis/Quantum-GIS] 08d8ea: Merge branch 'master' of
../Quantum-GIS
noreply at github.com
noreply at github.com
Sat Sep 24 18:59:35 EDT 2011
Branch: refs/heads/master
Home: https://github.com/qgis/Quantum-GIS
Commit: 08d8ea2d85c275bebeff206615822504737358e3
https://github.com/qgis/Quantum-GIS/commit/08d8ea2d85c275bebeff206615822504737358e3
Author: Tim Sutton <tim at linfiniti.com>
Date: 2011-09-24 (Sat, 24 Sep 2011)
Changed paths:
A CHANGELOG
M doc/CMakeLists.txt
M doc/SPONSORS
A doc/changelog.html
A doc/changelog.t2t
M doc/index.html
M doc/style.css
M src/app/qgisapp.cpp
M src/app/qgsabout.cpp
M src/app/qgsabout.h
M src/ui/qgsabout.ui
M src/ui/qgssponsorsbase.ui
Log Message:
-----------
Merge branch 'master' of ../Quantum-GIS
Commit: 93a190a38210c508617ae0da2a8faacf0bf806b3
https://github.com/qgis/Quantum-GIS/commit/93a190a38210c508617ae0da2a8faacf0bf806b3
Author: Tim Sutton <tim at linfiniti.com>
Date: 2011-09-24 (Sat, 24 Sep 2011)
Changed paths:
M CHANGELOG
M ChangeLog
M doc/CMakeLists.txt
M src/app/qgisapp.cpp
Log Message:
-----------
Fix some more merge confglicts after merging updates from 1.7 brnach
Commit: 602419242ed16af6c9b22af803105280f7ff4ffa
https://github.com/qgis/Quantum-GIS/commit/602419242ed16af6c9b22af803105280f7ff4ffa
Author: Tim Sutton <tim at linfiniti.com>
Date: 2011-09-24 (Sat, 24 Sep 2011)
Changed paths:
M debian/changelog
M debian/watch
M i18n/qgis_de.ts
M i18n/qgis_it.ts
M python/core/core.sip
M python/core/qgsproviderregistry.sip
A python/core/qgsvectorlayerimport.sip
M python/plugins/GdalTools/tools/widgetBuildVRT.ui
M python/plugins/GdalTools/tools/widgetClipper.ui
M python/plugins/GdalTools/tools/widgetGrid.ui
M python/plugins/GdalTools/tools/widgetMerge.ui
M python/plugins/GdalTools/tools/widgetProximity.ui
M python/plugins/osm/OsmAddRelationDlg.py
M python/plugins/osm/OsmDownloadDlg.py
M python/plugins/osm/OsmFeatureDW.py
M python/plugins/osm/OsmImportDlg.py
M python/plugins/osm/OsmLoadDlg.py
M python/plugins/osm/OsmPlugin.py
M python/plugins/osm/OsmSaveDlg.py
M python/plugins/osm/OsmUndoRedoDW.py
M python/plugins/osm/OsmUploadDlg.py
M src/app/qgisapp.cpp
M src/app/qgscustomization.cpp
M src/app/qgsmergeattributesdialog.cpp
M src/app/qgsmergeattributesdialog.h
M src/core/CMakeLists.txt
M src/core/composer/qgscomposermap.cpp
M src/core/qgsproviderregistry.cpp
M src/core/qgsproviderregistry.h
M src/core/qgsvectorfilewriter.h
A src/core/qgsvectorlayerimport.cpp
A src/core/qgsvectorlayerimport.h
M src/core/symbology-ng/qgsellipsesymbollayerv2.cpp
M src/plugins/grass/modules-6.3/default.qgc
M src/plugins/grass/modules-6.4/default.qgc
M src/plugins/grass/modules-common/v.generalize.qgm
M src/providers/ogr/qgsogrprovider.cpp
M src/providers/ogr/qgsogrprovider.h
M src/providers/postgres/qgspostgresprovider.cpp
M src/providers/postgres/qgspostgresprovider.h
M src/providers/spatialite/qgsspatialiteprovider.cpp
M src/providers/spatialite/qgsspatialiteprovider.h
M src/providers/wms/qgswmsprovider.cpp
M src/providers/wms/qgswmsprovider.h
M src/ui/qgsattributetabledialog.ui
Log Message:
-----------
Merge branch 'master' of github.com:qgis/Quantum-GIS
Commit: af56944d759ca323024d7e30fefa1dc58c49775f
https://github.com/qgis/Quantum-GIS/commit/af56944d759ca323024d7e30fefa1dc58c49775f
Author: Tim Sutton <tim at linfiniti.com>
Date: 2011-09-24 (Sat, 24 Sep 2011)
Changed paths:
M src/app/qgisapp.cpp
Log Message:
-----------
Restore override cursor when about box is shown
Compare: https://github.com/qgis/Quantum-GIS/compare/a0f8294...af56944
More information about the QGIS-commit
mailing list