diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-12-10 12:25:35 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2018-12-10 12:25:58 +0200 |
| commit | ec92b763774e3ee65e96323aa0778e1134392002 (patch) | |
| tree | b6251f72b58bac5240f25f29be8a4ae36c33c04c /basicsuite/demos.xml | |
| parent | 0fad7db4b7d34972b5b11fe31ceede43b3e6d0ea (diff) | |
| parent | c1352db30330ad88f41a3bf55bf8f76cabcfa130 (diff) | |
Merge remote-tracking branch 'origin/5.11' into 5.12
* origin/5.11:
c1352db Doc: Bump version to 5.11.3
Conflicts:
doc/b2qt-demos.qdoc
doc/b2qt-demos.qdocconf
Change-Id: I428063bca6edb76a659d34bf4b4d7d7e8f1f5cab
Diffstat (limited to 'basicsuite/demos.xml')
0 files changed, 0 insertions, 0 deletions