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

..

analysis

prepare-commit.sh: remove trailing blanks from python files

2013-01-12 23:48:58 +01:00

console

Add QgsMessageBar for pyqgis console

2013-01-15 12:15:51 +01:00

core

Merge branch 'composer_inference_lines'

2013-01-18 17:07:05 +01:00

gui

Add adjustable Qt stylesheet class, QgisAppStyleSheet

2013-01-21 01:49:13 -07:00

plugins

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

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

pyspatialite

add more copyrights

2012-10-06 13:32:08 +02:00

qsci_apis

debian packaging update - also moved python console files and icons

2012-10-05 18:30:19 +02:00

__init__.py

another copyright update

2012-10-08 00:29:13 +02:00

CMakeLists.txt

fix output directory for pyqgis console on installing

2012-12-20 01:43:01 +01:00

utils.py

remove trailing blanks

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

widgets_tree.py

remove trailing blanks

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