Eike Ziller cff2cc90e2 Merge remote-tracking branch 'origin/4.5' ...

Conflicts:
	src/plugins/cpptools/clangcompileroptionsbuilder.cpp
	src/plugins/cpptools/clangcompileroptionsbuilder.h
	src/plugins/cpptools/compileroptionsbuilder.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.cpp
	src/plugins/qmlprofiler/qmlprofilerclientmanager.h
	src/plugins/qmlprofiler/qmlprofilertraceclient.cpp
	src/plugins/qmlprofiler/qmlprofilertraceclient.h
	src/shared/qbs

Change-Id: I364ababc5d41046d17e999096c4a7187c4e4e010

2018-01-09 13:13:00 +01:00

..

dark.creatortheme

Merge remote-tracking branch 'origin/4.5'

2018-01-09 13:13:00 +01:00

default.creatortheme

Themes: Fix gradient color in Projects mode

2018-01-05 14:53:59 +00:00

flat-dark.creatortheme

Themes: Fix gradient color in Projects mode

2018-01-05 14:53:59 +00:00

flat-light.creatortheme

Themes: Fix gradient color in Projects mode

2018-01-05 14:53:59 +00:00

flat.creatortheme

Themes: Fix gradient color in Projects mode

2018-01-05 14:53:59 +00:00