Martin Dobias fafa58ed24 Merge remote-tracking branch 'origin/master' into threading-revival ...

Conflicts:
	src/core/qgspallabeling.cpp
	src/core/qgsrenderchecker.h
	src/core/qgsvectorlayer.cpp
	src/core/symbology-ng/qgslinesymbollayerv2.cpp
	src/core/symbology-ng/qgssymbollayerv2.cpp
	src/providers/wms/qgswmsdataitems.cpp
	tests/src/core/testqgsblendmodes.cpp

2014-02-23 20:12:50 +07:00

..

analysis

update sip bindings II

2014-01-27 09:22:53 +01:00

console

update qgis.org links

2014-02-07 21:02:11 +01:00

core

Merge remote-tracking branch 'origin/master' into threading-revival

2014-02-23 20:12:50 +07:00

gui

Change "added/deprecated in 2.1" notes to 2.4 for stuff related to threading

2014-02-21 17:33:09 +07:00

plugins

[fTools] Spatial join aggregates: handle NULL values

2014-02-23 10:39:14 +01:00

pyplugin_installer

[Plugin Installer] More robust xml parsing: fix lonely ampersands. Fixes #9524

2014-02-18 17:01:41 +01:00

pyspatialite

…

qsci_apis

[pyqgis-console] prepared apis file update

2014-02-19 16:56:56 +01:00

__init__.py

…

CMakeLists.txt

[FEATURE]: merge dxf_export branch

2013-12-06 17:46:47 +01:00

utils.py

…