Eike Ziller 79bd453feb Merge remote-tracking branch 'origin/3.1' ...

Conflicts:
	src/plugins/winrt/winrtruncontrol.cpp
	src/plugins/winrt/winrtruncontrol.h

Change-Id: Idad0558e53e23debee8523586b681af4705e97f6

2014-06-24 14:52:00 +02:00

..

qtcreator

Merge remote-tracking branch 'origin/3.1'

2014-06-24 14:52:00 +02:00

share.pro

Include qbs files in qmake project tree

2012-10-16 12:07:53 +02:00

share.qbs

use new base import style in qbs files

2014-03-11 14:20:22 +01:00