summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:30:19 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:30:19 +0200
commite4f2f0a146a83fa3160687ca06e11430ff02c5a8 (patch)
tree88a6ad071e5e0e7b489d7b8611fde533f951b82f
parent7680c0db0e1f6b43f272a7d41909920015dc7ac3 (diff)
parent32b1ce9e1b1542f6779abcbcd78613b15149aaaa (diff)
downloadqtx11extras-e4f2f0a146a83fa3160687ca06e11430ff02c5a8.tar.gz
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5.15.5
Conflicts: .qmake.conf Change-Id: I940895f7ce36969a273e8e3761dbe370e2dad951
0 files changed, 0 insertions, 0 deletions