diff options
author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-21 16:14:42 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2016-03-21 18:40:23 +0000 |
commit | f9e746959b9c7acbc080c410fe5cb5dff127c5dd (patch) | |
tree | b602fcc7baaa934f3f8fbd338f4dae6c906c1ede /src/plugins/platforms/cocoa/cocoa.pro | |
parent | 686e37b1b7c40d0e864ab47165be3a0d4faa9a68 (diff) | |
parent | 6cb8121a44ee0f94f2c9fcb075d1d3c802d8c5c7 (diff) |
Merge "Merge remote-tracking branch 'origin/5.6' into 5.7" into refs/staging/5.7
Diffstat (limited to 'src/plugins/platforms/cocoa/cocoa.pro')
0 files changed, 0 insertions, 0 deletions