summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:29:52 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-08-19 16:29:52 +0200
commitdf729f9f284df2d30db432de351e7e80360097c8 (patch)
tree5390b52a7b99e08fecfbd309c97e2dbe78253b34
parentd2210279b4d9b589470d480676da9c6643a8bc5b (diff)
parent9f20ed0b48f4e5adcc9558b2cc4171eb17f243dd (diff)
Merge remote-tracking branch 'origin/5.4' into 5.5v5.5.15.5
Conflicts: .qmake.conf Change-Id: I39ddca72cf8d70c2663cc75a87c2295f8d564baf
0 files changed, 0 insertions, 0 deletions