summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@digia.com>2014-06-26 17:29:48 +0200
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-06-26 17:29:48 +0200
commit7c495cafb3d6f97962d2914d391d9343156143de (patch)
tree50033216a09f29f6da72b1bc55e2c9404f2f62fb
parentb0a10dde5f1e747295d87e93779a72734e74affa (diff)
parent61e0824f2490b2a5f67117cc005318887f6f237c (diff)
downloadqtx11extras-7c495cafb3d6f97962d2914d391d9343156143de.tar.gz
Merge remote-tracking branch 'origin/5.3' into dev
Conflicts: .qmake.conf Change-Id: I8150980a590b864feb41d90ba09bbcbac8da8225
0 files changed, 0 insertions, 0 deletions