summaryrefslogtreecommitdiffstats
path: root/.qmake.conf
diff options
context:
space:
mode:
authorSamuli Piippo <samuli.piippo@qt.io>2016-08-26 10:58:45 +0300
committerSamuli Piippo <samuli.piippo@qt.io>2016-08-26 10:59:16 +0300
commit78eb50815059026b50849eb45b95654c59ba88dc (patch)
treee0167d027788e50a0ab7a2f7d5c1a0379463fa63 /.qmake.conf
parentcd9f0c40f30226c7ce1c3259aea8ebca08acfbb8 (diff)
parent2dcc014980437b87564b7f9f86a06894efa5ea75 (diff)
Merge remote-tracking branch 'origin/5.6' into 5.7
* origin/5.6: Update qtwebbrowser submodule url. Change-Id: I94f8090403597215c433447fa4f8184055ee412a
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions