Victor Olaya 2231971ead Merge branch 'master' of https://github.com/qgis/Quantum-GIS ...

Conflicts:
	python/plugins/sextante/algs/ftools/Difference.py
	python/plugins/sextante/algs/ftools/Intersection.py
	python/plugins/sextante/outputs/OutputTable.py

2013-01-21 23:10:50 +01:00

..

db_manager

Quality topology layer names

2013-01-08 16:18:41 +01:00

fTools

fix #4534

2013-01-08 10:24:07 +01:00

GdalTools

fix typo in gdal tools

2013-01-17 12:43:51 +01:00

mapserver_export

remove trailing blanks

2012-12-10 00:12:07 +01:00

osm

more API updates to the python plugins

2013-01-04 23:02:44 +01:00

plugin_installer

remove trailing blanks

2012-12-10 00:12:07 +01:00

sextante

Merge branch 'master' of https://github.com/qgis/Quantum-GIS

2013-01-21 23:10:50 +01:00

CMakeLists.txt

Update for d7a7a46, make sure targets are always built for install

2012-10-31 05:18:13 -06:00