projects / platform / upstream / qttools.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d566369 e863246)
Merge remote-tracking branch 'origin/5.5' into dev
authorLiang Qi <liang.qi@theqtcompany.com>
Mon, 29 Jun 2015 18:12:41 +0000 (20:12 +0200)
committerLiang Qi <liang.qi@theqtcompany.com>
Mon, 29 Jun 2015 18:12:41 +0000 (20:12 +0200)
Conflicts:
.qmake.conf

Change-Id: I2424cf97743b3f998bf7b10a21f8075ed76b613f


Trivial merge
Domain: UI Framework / Qt;