diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-26 12:29:45 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2015-05-26 12:29:45 +0200 |
| commit | e16dffd3e0e8dbc1aadb686b6c502944d9557de9 (patch) | |
| tree | 46011f6abdd54d2567e7985d132f78594db9751a /examples | |
| parent | d709388240837cf82cb68ac98c60c1565132a802 (diff) | |
| parent | 3a3a7d799b4f57fc81cd2bef596f63aa68d42b41 (diff) | |
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.0-rc1v5.5.0
Conflicts:
.qmake.conf
Change-Id: I769ed6443b24c3329f614807d91bcfdde93939f9
Diffstat (limited to 'examples')
0 files changed, 0 insertions, 0 deletions