Commit 27de6787 authored by Oswald Buddenhagen's avatar Oswald Buddenhagen

Merge remote-tracking branch 'origin/2.6' into 2.7

Conflicts:
	share/qtcreator/translations/qtcreator_uk.ts

Change-Id: Idedbd2dd847e7429e5455eddabc0b7e191dcb703
parents 4ae4f05f 619e52eb
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment