Nathan Woodrow 9094575b80 Merge branch 'master' of https://github.com/qgis/QGIS ...

Conflicts:
	src/gui/attributetable/qgsfieldconditionalformatwidget.cpp

2015-08-25 22:45:05 +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 branch 'master' of https://github.com/qgis/QGIS

2015-08-25 22:45:05 +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

[DBManager] get default pk, geom and srid values from input layer to set default options in import vector dialog

2015-08-25 02:39:19 +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