Martin Dobias 9317ffd89a Merge remote-tracking branch 'origin/master' into new_vector_api ...

Also disabled mapserver until compilation is fixed.
Fixed tests.

Conflicts:
	src/app/legend/qgslegendlayer.cpp
	src/app/qgsattributedialog.cpp
	src/app/qgsattributedialog.h
	src/app/qgslabelpropertydialog.cpp
	src/app/qgsmaptoollabel.cpp
	src/app/qgsvectorlayerproperties.cpp
	src/core/CMakeLists.txt
	src/core/composer/qgsatlascomposition.cpp
	src/core/qgsexpression.cpp
	src/core/qgspallabeling.cpp
	src/core/qgsvectorlayer.cpp
	src/core/qgsvectorlayer.h
	src/core/qgsvectorlayerimport.cpp
	src/mapserver/qgsprojectparser.cpp
	src/mapserver/qgswfsserver.cpp
	src/mapserver/qgswfsserver.h
	src/mapserver/qgswmsserver.cpp
	src/providers/postgres/qgspostgresprovider.cpp
	src/providers/spatialite/qgsspatialiteprovider.h
	tests/src/core/testqgsexpression.cpp
	tests/src/python/test_qgsmemoryprovider.py

2012-12-18 01:35:06 +01:00

..

analysis

…

console

remove trailing blanks

2012-12-10 00:12:07 +01:00

core

Merge remote-tracking branch 'origin/master' into new_vector_api

2012-12-18 01:35:06 +01:00

gui

Merge remote-tracking branch 'origin/master' into new_vector_api

2012-12-18 01:35:06 +01:00

plugins

Fixes issue #5505

2012-12-16 21:37:13 +01:00

pyspatialite

…

qsci_apis

…

__init__.py

…

CMakeLists.txt

…

utils.py

remove trailing blanks

2012-12-10 00:12:07 +01:00

widgets_tree.py

remove trailing blanks

2012-12-10 00:12:07 +01:00