summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:21:53 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:21:53 +0200
commit38b83c33f3955570627f0235fa920b2b54440bdc (patch)
treef94fd0b5d7f6408fbc810808b0f53b9f4cb63cde
parenteb53c36aedf384f7e7eeee9dd543c4b1d21f0161 (diff)
parent42b878b16157fdbe9fb0254459536f00abb194b5 (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5
Conflicts: .qmake.conf Change-Id: Id1e361a9a0ce78700acd839a0411d608ab15a442
0 files changed, 0 insertions, 0 deletions