diff options
author | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:30:05 +0100 |
---|---|---|
committer | Frederik Gladhorn <frederik.gladhorn@digia.com> | 2014-01-17 17:30:05 +0100 |
commit | d229decb2d9d91e407d3fb97694684a4a774cc9b (patch) | |
tree | 4b712ab29b87e87d9a950fb3f6bf5207ac631e2d | |
parent | dc452d0b83229ea8eb518b363d1402bda62ecbcd (diff) | |
parent | dd7eec92e7a5f4383783cc161f638867572dc208 (diff) | |
download | qtx11extras-d229decb2d9d91e407d3fb97694684a4a774cc9b.tar.gz |
Merge remote-tracking branch 'origin/stable' into devv5.3.0-alpha1
Conflicts:
.qmake.conf
Change-Id: I9b3732bd9c128ec862b0b9a91881f44322142479
0 files changed, 0 insertions, 0 deletions