diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 09:47:12 +0300 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-04-26 09:47:39 +0300 |
| commit | c10b4e842adaf096bf46ed5f98e236f3fee87870 (patch) | |
| tree | c91d66d8a9628d9af8bfe868ac8945173db098ab /doc/b2qt-demos.qdoc | |
| parent | 0ea39397893edb54454bfceabde4b83fc5b60a2e (diff) | |
| parent | 34310ed69919f452dbcdae42f350254a40a06113 (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
34310ed Split demos.xml to individual xml files
7eea480 Doc: Bump version to 5.12.3
Conflicts:
doc/b2qt-demos.qdoc
doc/b2qt-demos.qdocconf
Change-Id: I25c43406d1940d7e7ebb0427f91a6638f4b7273d
Diffstat (limited to 'doc/b2qt-demos.qdoc')
0 files changed, 0 insertions, 0 deletions