Martin Dobias 5f304b34a1 Merge remote-tracking branch 'origin/master' into new_vector_api
Conflicts:
	python/core/qgsvectordataprovider.sip
	src/app/legend/qgslegendlayer.cpp
	src/app/qgisapp.cpp
	src/app/qgsmergeattributesdialog.cpp
	src/core/qgsvectordataprovider.cpp
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorlayer.cpp
	src/gui/qgssearchquerybuilder.cpp
	src/providers/postgres/qgspostgresprovider.cpp
	src/providers/wfs/CMakeLists.txt
2013-01-23 23:46:56 +01:00
..
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-10-05 21:56:43 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-09-26 18:46:52 +02:00