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-10-16 10:34:34 +02:00
2012-11-18 12:53:03 +01:00
2012-11-02 19:13:31 +02:00
2013-01-21 01:49:13 -07:00
2013-01-12 23:48:58 +01:00
2012-09-24 02:42:57 +02:00
2012-09-25 18:37:37 -03:00
2010-01-15 23:55:23 +00:00
2012-09-24 02:42:57 +02:00
2012-12-11 14:04:56 +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-11-25 11:33:38 +01:00
2012-12-18 01:35:06 +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-11-02 19:13:31 +02:00
2012-09-24 02:42:57 +02:00
2012-12-23 10:40:23 +02:00
2012-09-24 02:42:57 +02:00
2012-12-17 23:32:49 +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-23 10:40:23 +02:00
2013-01-12 23:48:58 +01:00
2012-12-23 10:40:23 +02:00
2012-09-24 02:42:57 +02:00
2012-11-19 20:03:53 +01:00
2012-09-24 02:42:57 +02:00
2013-01-12 23:48:58 +01:00
2013-01-12 23:48:58 +01:00
2012-09-24 02:42:57 +02:00
2012-09-24 23:53:58 +02:00
2012-09-24 02:42:57 +02:00
2013-01-14 17:04:34 -07: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-12-23 10:40:23 +02:00
2012-09-24 02:42:57 +02:00
2013-01-12 23:48:58 +01:00
2013-01-12 23:48:58 +01:00
2012-09-24 02:42:57 +02:00
2012-09-24 02:42:57 +02:00
2012-12-25 16:58:06 +01: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
2013-01-12 23:48:58 +01:00