Nathan Woodrow 83115cd16a Merge row style support for attribute table ...

Conflicts:
	python/core/qgsconditionalstyle.sip
	python/core/qgsfielduiproperties.sip
	src/core/qgsfielduiproperties.cpp
	src/core/qgsfielduiproperties.h
	src/gui/attributetable/qgsattributetablemodel.cpp
	src/ui/qgsfieldconditionalformatwidget.ui
	tests/src/python/test_qgsconditionalstyle.py

2015-08-23 12:35:29 +10:00

..

analysis

indentation update

2015-07-29 11:52:14 +02:00

console

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00

core

Merge row style support for attribute table

2015-08-23 12:35:29 +10:00

custom_widgets

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00

ext-libs

Remove executable flag on a bunch of files

2015-07-20 15:45:44 +02:00

gui

Fix filtering of highlighted variables

2015-08-22 19:01:43 +10:00

networkanalysis

…

plugins

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00

pyplugin_installer

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00

qsci_apis

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00

server

Moved QMultiMap<int, TYPE2*> to conversion.sip

2015-08-07 09:26:14 +02:00

__init__.py

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00

CMakeLists.txt

[SERVER] Server refactoring and Python bindings/tests

2015-06-29 12:49:43 +02:00

user.py

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00

utils.py

indentation update (now including autopep8)

2015-08-22 14:29:41 +02:00