diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-12-10 12:40:40 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-12-10 12:41:10 +0200 |
| commit | 14ec8089ea9ad0bc2bd5b897a64504fa12ea7c7e (patch) | |
| tree | 9664c705e871827f8e37cb194912f0e52beaeee5 | |
| parent | d82667fb28c6488ba5f7e03cd080f764576c044d (diff) | |
| parent | 28c73956194145393a4e4ee9dc9d214154a29c14 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
28c7395 Doc: Bump version to 5.11.3
Conflicts:
.qmake.conf
Change-Id: I8f8ebd9ed573e3f54d6f3f3c2e9c3ef590ca00fb
0 files changed, 0 insertions, 0 deletions