diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-31 09:53:10 +0200 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-03-31 09:53:10 +0200 |
| commit | c80e96bb09ebcf0b031843b58efb4ef037246bf1 (patch) | |
| tree | 717a6bf41b08ff1b3ddb43e9b003fc9b7a40a2e1 /qtdeclarative | |
| parent | f05fece2f774137a08a1578ed2499f4890aee799 (diff) | |
| parent | 84a1676ed6566d548f2cce35ced9c0524f41c349 (diff) | |
Merge remote-tracking branch 'origin/5.6.0' into 5.6
Conflicts:
.gitmodules
Change-Id: Ic9c8564006c2722f925700f09ff42da3e912f580
Diffstat (limited to 'qtdeclarative')
0 files changed, 0 insertions, 0 deletions