diff options
| author | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:10 +0100 |
|---|---|---|
| committer | Qt Forward Merge Bot <qt_forward_merge_bot@qt-project.org> | 2019-01-22 09:29:10 +0100 |
| commit | cfae6ffed9b6d8a682e0eac7df45219c5ef19589 (patch) | |
| tree | 2c260c2a37783426ae8516ef3a16cb74956342b5 | |
| parent | 5ca3040606c9dce1a410f1da059a501c03fc2cd9 (diff) | |
| parent | 79984891427743dfb16df056ecee56384024e93e (diff) | |
| download | qtxmlpatterns-cfae6ffed9b6d8a682e0eac7df45219c5ef19589.tar.gz | |
Merge remote-tracking branch 'origin/5.12' into dev
Conflicts:
.qmake.conf
Change-Id: I2a31f29b54049463ffcf2de9c65d228b7d07bf6a
0 files changed, 0 insertions, 0 deletions