diff options
| author | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:21 +0200 |
|---|---|---|
| committer | Frederik Gladhorn <frederik.gladhorn@theqtcompany.com> | 2015-08-09 15:27:21 +0200 |
| commit | 66b68ed94032e03b7a0ed9d15f72b1fc5e2cb729 (patch) | |
| tree | e0093cca956690a272f9415a2743064ec1d3dd71 /examples/quick/controls/uiforms/main.cpp | |
| parent | be50531985f64089c87289ba0c026007437517a2 (diff) | |
| parent | 6afc4815a1e20f795591ef7d1452a521920ce0bd (diff) | |
Merge remote-tracking branch 'origin/5.5' into dev
Change-Id: Ifec0f56816809abb90a294b8462391cb7e54c87d
Diffstat (limited to 'examples/quick/controls/uiforms/main.cpp')
0 files changed, 0 insertions, 0 deletions