Merge origin/2.8 into 3.0

Browse Source

Conflicts:
	src/plugins/qmldesigner/designercore/metainfo/nodemetainfo.cpp

Change-Id: I1028a14230b9dea0cdb68068469a96e8ddb78754

...

This commit is contained in:

Eike Ziller

2013-10-22 11:37:14 +02:00

parent 8f00f261aa a6d6db3397

commit 16c2ee1b99

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