diff options
| author | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-21 10:07:14 +0200 |
|---|---|---|
| committer | Simon Hausmann <simon.hausmann@qt.io> | 2017-07-21 10:07:35 +0200 |
| commit | d26940d7769a35a517195079d7b402b0b6eb3c92 (patch) | |
| tree | 3529e42d7bc3de903382a2dfc566b74675f188f0 /.qmake.conf | |
| parent | 43c28d4084a2c3e63cf02f45c03c9514ee8af2a4 (diff) | |
| parent | 54e7255eb18b1247d7cfda2d6bc120dc9c0f119b (diff) | |
| download | qtxmlpatterns-d26940d7769a35a517195079d7b402b0b6eb3c92.tar.gz | |
Merge remote-tracking branch 'origin/5.9' into dev
Conflicts:
.qmake.conf
Change-Id: If5ed6ad45422c7cf8a250e31a10ce2930e5c1cf7
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions