diff options
author | Allan Sandfeld Jensen <allan.jensen@theqtcompany.com> | 2015-03-06 16:53:00 +0000 |
---|---|---|
committer | The Qt Project <gerrit-noreply@qt-project.org> | 2015-03-06 16:53:00 +0000 |
commit | 8e72001f4b51b4695065842882aa5898a7340ecd (patch) | |
tree | ef8b536d679d1f4419cc418dd0b5cd2f3aa37c41 /Tools/qmake/mkspecs/features/default_pre.prf | |
parent | d42997003988a8eae8a11841cfffbc5ede2e3069 (diff) | |
parent | 76f56fd0029bf4d2a929cd2fc133c1f6ac1054b4 (diff) | |
download | qtwebkit-8e72001f4b51b4695065842882aa5898a7340ecd.tar.gz |
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'Tools/qmake/mkspecs/features/default_pre.prf')
0 files changed, 0 insertions, 0 deletions