Martin Dobias b20619623f Merge branch 'master' into dbl ...

Conflicts:
	images/splash/splash.png
	src/CMakeLists.txt
	src/app/main.cpp
	src/app/qgsvectorlayerproperties.cpp
	src/core/qgsvectorlayer.cpp
	src/providers/wms/qgswmssourceselect.cpp

2011-05-13 22:20:43 +02:00

..

analysis

[FEATURE] Added rule-based renderer for symbology-ng.

2010-06-12 10:11:19 +00:00

core

some more svn to git migration updates/fixes

2011-05-06 16:39:45 +02:00

gui

apply #3770: allow adding parts to line and point features and some refactoring

2011-05-06 00:48:29 +02:00

plugins

allow merging shapefiles with different attribute tables (fix #3010)

2011-05-12 19:42:24 +03:00

pyspatialite

add QGISDEPRECATED macro and fix a bunch of warnings

2011-02-18 15:05:35 +00:00

__init__.py

update permissions

2010-05-10 18:52:30 +00:00

CMakeLists.txt

update version tracking to git

2011-05-04 21:56:25 +02:00

console.py

fix #3712

2011-04-16 15:21:18 +00:00

utils.py

some more svn to git migration updates/fixes

2011-05-06 16:39:45 +02:00

widgets_tree.py

All customization and QGIS browser work in one commit.

2011-05-13 22:00:46 +02:00