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
..
2014-01-27 09:22:53 +01:00
2014-01-27 09:30:53 +01:00
2014-01-26 18:36:29 +01:00
2014-01-26 18:36:29 +01:00
2014-01-26 18:36:29 +01:00
2013-06-22 19:41:34 +02:00
2014-01-27 09:30:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-26 18:36:29 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-26 18:36:29 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-28 00:26:13 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2013-06-23 16:00:24 +02:00
2014-01-27 09:22:53 +01:00
2014-01-26 18:36:29 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-26 18:36:29 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-28 00:26:13 +01:00
2014-01-27 09:22:53 +01:00
2014-01-27 09:22:53 +01:00
2014-01-26 18:36:29 +01:00
2014-01-26 18:36:29 +01:00
2013-06-23 16:00:24 +02:00