diff options
author | Denis Shienkov <denis.shienkov@gmail.com> | 2019-10-09 22:20:56 +0300 |
---|---|---|
committer | Denis Shienkov <denis.shienkov@gmail.com> | 2019-10-10 14:01:56 +0000 |
commit | 39ddab6b69fb3bbd14c5aa019e31271c65e6f16c (patch) | |
tree | a220396e7001cf7e3043459ba376502e8f56eea4 /static.pro | |
parent | 905ee49fabe197bfe4537c1f10df9d7c48f731c2 (diff) |
baremetal: Fix merging issues from 1.14 to master
Change-Id: Id859d95ddfb776ec534ba0e46d989bb2ba30770a
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
Diffstat (limited to 'static.pro')
0 files changed, 0 insertions, 0 deletions