diff options
| author | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-06 10:27:56 +0200 |
|---|---|---|
| committer | Mikko Gronoff <mikko.gronoff@qt.io> | 2019-02-06 11:49:07 +0200 |
| commit | 0ea39397893edb54454bfceabde4b83fc5b60a2e (patch) | |
| tree | 16cf3924185d39df0354767404051175377029be /basicsuite/graphicaleffects/demo.xml | |
| parent | 8f0cc63e40451cd1ffaf39cfcac37012a37f255f (diff) | |
| parent | f732f98e0cb3871c5a2cb1c94d68f812daa9abba (diff) | |
Merge remote-tracking branch 'origin/5.12' into 5.13
* origin/5.12:
f732f98 Doc: Bump version to 5.12.2
ec7cc51 Enable boot2qt launcher automatic demo mode
Change-Id: Ie4b7653de8f87d6a31d3af83bc80876294f7620d
Diffstat (limited to 'basicsuite/graphicaleffects/demo.xml')
0 files changed, 0 insertions, 0 deletions