Commit 32377a9a authored by Eike Ziller's avatar Eike Ziller

Merge remote-tracking branch 'origin/4.4' into 4.5

Change-Id: Ia5b4d0c1c2b5a410ec3215df1c19b56e236606cf
parents 527fd0fa 6e48d0cd
[submodule "qbs"]
path = src/shared/qbs
url = ../../qt-labs/qbs.git
url = ../../qbs/qbs.git
ignore = dirty
This source diff could not be displayed because it is too large. You can view the blob instead.
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