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-10-11 16:12:09 +02:00
2012-10-11 16:12:09 +02:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2013-01-12 23:48:58 +01:00
2012-09-24 02:42:57 +02:00
2012-12-20 14:44:10 +01:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2013-01-12 23:48:58 +01:00
2012-10-16 11:10:43 +02:00
2013-01-23 23:46:56 +01:00
2012-12-17 14:04:10 +01:00
2012-10-11 16:12:09 +02:00
2012-10-11 16:12:09 +02:00
2012-09-24 02:42:57 +02:00
2012-12-17 14:04:10 +01:00
2012-12-17 14:04:10 +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-12-06 12:52:17 +02:00
2012-09-24 02:42:57 +02:00
2012-10-11 16:12:09 +02:00
2012-10-11 16:12:09 +02:00
2012-10-11 16:12:09 +02:00