diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-16 13:07:12 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2019-05-16 13:07:12 +0200 |
commit | 4561b5a83966792b7325e63c91d78a6f70e65961 (patch) | |
tree | 8cab52ca2dbaf1acee2292eede72d23c4d63f3b7 /src/core/type_conversion.h | |
parent | 0c2beb49b858f49489fa4f1ecee6bfdd6ce57e68 (diff) | |
parent | ea1395e48205dd45f2485a40e8a3f23273cc4ad3 (diff) |
Merge remote-tracking branch 'origin/5.13' into dev
Change-Id: Idd02779e2910a792d50bb703ab92cd4da47f45fc
Diffstat (limited to 'src/core/type_conversion.h')
0 files changed, 0 insertions, 0 deletions