diff options
author | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:49:03 +0100 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-11-24 11:49:03 +0100 |
commit | a97868ac6da467a07fe0b18b23dd1fb3f2bdaf7e (patch) | |
tree | eaff1871d653b239f4e60f66c6ad8ac1602084d1 /src/plugins/qnx/qnx.pro | |
parent | d3a2d9c96994c56d67467c131b8f080510d1a8fd (diff) | |
parent | e4aef963cbd32274669af6b66158f6f0ca4ba3ed (diff) |
Merge remote-tracking branch 'origin/5.7.1' into 5.7
Change-Id: I6690c4161c57734ad03ee3e03311a3e62f181e89
Diffstat (limited to 'src/plugins/qnx/qnx.pro')
0 files changed, 0 insertions, 0 deletions