diff options
| author | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 17:03:08 +0100 |
|---|---|---|
| committer | J-P Nurmi <jpnurmi@qt.io> | 2016-11-17 17:03:08 +0100 |
| commit | 7903979d3585b73adf3c2c2b88b5c94c303b8302 (patch) | |
| tree | 5e7b1b6ec6025778002f9312de7a14acf39011dc /.gitignore | |
| parent | af9729ecf4434c5884cb61b990b819aaccd3af9b (diff) | |
| parent | 2202d79b39ff90eed19fb8106f79d4604e47acfd (diff) | |
Merge remote-tracking branch 'origin/5.7' into 5.8
Conflicts:
tests/auto/controls/data/tst_button.qml
Change-Id: I5c97b3c1944e52dba44fd3c7d6d9a255c5e08cf7
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions