Merge remote-tracking branch 'origin/3.3' into 3.4

Browse Source

Conflicts:
	qtcreator.pri
	qtcreator.qbs

Change-Id: Ieb0b3d9a598b9c99f4339fa64e92cf8b72d4bf5f

...

This commit is contained in:

Eike Ziller

2015-04-15 15:45:34 +02:00

parent 7007bf4057 c073ce4562

commit 340882f564

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available