Eike Ziller b5b47f7df2 Merge remote-tracking branch 'origin/3.3' ...

Conflicts:
	src/plugins/cppeditor/cppdocumentationcommenthelper.cpp

Change-Id: I2cf25eba1de149765a6c44ad354d606ce9de512d

2015-01-08 10:38:20 +01:00

..

qtcreator

Merge remote-tracking branch 'origin/3.3'

2015-01-08 10:38:20 +01:00

share.pro

use DISTFILES instead of OTHER_FILES in creator's own build system

2014-09-15 12:10:01 +02:00

share.qbs

Implement theming for QtCreator

2014-10-15 17:21:10 +02:00