diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-20 12:37:50 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-11-20 12:40:17 +0200 |
| commit | 3cebadbdc9a9ca7afeb0ad93f2b3d548ffd4b913 (patch) | |
| tree | 6dccae1c37a5c244d1764d8dff3783f36b9a41c1 | |
| parent | bdfc2094a1c4a4e27676149529f288678cadcc46 (diff) | |
| parent | c2771f750bd2764c5099b8493aed6834a03d0d71 (diff) | |
Merge remote-tracking branch 'origin/5.13' into 5.14
No actual changes, just merging finalized branch upstream.
* origin/5.13:
c2771f7 Merge remote-tracking branch 'origin/5.12' into 5.13
73ad9d6 Doc: Bump version to 5.12.6
3de0cb9 Doc: Bump version to 5.13.2
9cb1b24 Doc: Bump version to 5.12.5
0f67624 Doc: Bump version to 5.12.4
Conflicts:
doc/b2qt-demos.qdoc
doc/b2qt-demos.qdocconf
Change-Id: Ibf2145834a65ffc5243081d705ec2f301ead859a
0 files changed, 0 insertions, 0 deletions