summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSergio Ahumada <sahumada@blackberry.com>2014-06-14 21:49:31 +0200
committerSergio Ahumada <sahumada@blackberry.com>2014-06-14 21:49:31 +0200
commitb0a10dde5f1e747295d87e93779a72734e74affa (patch)
tree50033216a09f29f6da72b1bc55e2c9404f2f62fb
parent3712ecc7295b91176f51763a048a83a9c7b98d01 (diff)
parent2d84caf5ef1b5dace0d678df4581db3c955be6ee (diff)
downloadqtx11extras-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