diff options
author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-26 10:35:52 +0200 |
---|---|---|
committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2017-09-29 16:58:04 +0200 |
commit | fa12e9c1c3634696cf3e0754ab9c374456945efc (patch) | |
tree | 7729c6d1990dc2d9f4746c45e7fcae96d41a0128 /src/core/color_chooser_controller.h | |
parent | 9d962bc9424c71a451d04741619c9597f3da8010 (diff) | |
parent | d044140246734b8851689f55197c03cfd29dec99 (diff) |
Merge remote-tracking branch 'origin/5.9' into 5.10
Change-Id: I7094e85a7770303a2ae30baccbc484c04f33600e
Diffstat (limited to 'src/core/color_chooser_controller.h')
0 files changed, 0 insertions, 0 deletions