diff options
| author | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:19:48 +0100 |
|---|---|---|
| committer | Liang Qi <liang.qi@theqtcompany.com> | 2016-02-15 21:19:48 +0100 |
| commit | b24bd0e87891d9f61e0121cbdcbbe0797863f316 (patch) | |
| tree | 311986cf156ad671ac984765035f2d3b311ff19f /.qmake.conf | |
| parent | 1f4c37adfacadec463884f4c22850c74a0c5893f (diff) | |
| parent | a8d103a05bc195dd045779f3aebdf67bd0140df1 (diff) | |
| download | qtxmlpatterns-b24bd0e87891d9f61e0121cbdcbbe0797863f316.tar.gz | |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I1c0ac322f30448a64b55b1ef60f60326ca0171a6
Diffstat (limited to '.qmake.conf')
0 files changed, 0 insertions, 0 deletions