Eike Ziller d008779bf7 Merge remote-tracking branch 'origin/3.2' ...

Conflicts:
	src/plugins/projectexplorer/projectexplorer.cpp

Change-Id: I6dffc1925e6bf35cf6e9fe0676c11d1a5143a208

2014-09-29 13:40:53 +02:00

..

qmldump

remove pointless uses of OTHER_FILES

2014-09-15 12:51:02 +02:00

qmlpuppet

Merge remote-tracking branch 'origin/3.2'

2014-09-29 13:40:53 +02:00