diff options
author | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:49:31 +0200 |
---|---|---|
committer | Sergio Ahumada <sahumada@blackberry.com> | 2014-06-14 21:49:31 +0200 |
commit | b0a10dde5f1e747295d87e93779a72734e74affa (patch) | |
tree | 50033216a09f29f6da72b1bc55e2c9404f2f62fb | |
parent | 3712ecc7295b91176f51763a048a83a9c7b98d01 (diff) | |
parent | 2d84caf5ef1b5dace0d678df4581db3c955be6ee (diff) | |
download | qtx11extras-b0a10dde5f1e747295d87e93779a72734e74affa.tar.gz |
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts:
.qmake.conf
Change-Id: Id4d3d030c5cb609a4b7ad03c5496a9a5625d46c5
0 files changed, 0 insertions, 0 deletions