diff options
| author | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-05 07:46:06 +0200 |
|---|---|---|
| committer | Jani Heikkinen <jani.heikkinen@qt.io> | 2018-01-05 07:47:26 +0200 |
| commit | 18f6169bee4d687f9aca39cede82e89dbfa95bbe (patch) | |
| tree | 470804ca5ec7d0c3368cc3e1c01aa30ff5a1d1b2 /qtbase | |
| parent | a0bf828433b375c752713d6935ddb9134b2c68d3 (diff) | |
| parent | 4fb893fcf8ef55ff3ebbdf684c4d1cfab913cea0 (diff) | |
Merge remote-tracking branch 'origin/5.9' into 5.9.4
This merge wasn't done during final downmerge from '5.9' -> '5.9.4'
Change-Id: I516c24ba52575634f3932ff4f40221f31ef06ee0
Diffstat (limited to 'qtbase')
| m--------- | qtbase | 0 |
1 files changed, 0 insertions, 0 deletions
diff --git a/qtbase b/qtbase -Subproject ffc8409aa58c04c1dd140001976b55925ac959f +Subproject 44da5b863597e761df3545dc7ff02a9b53bbb13 |