summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-05-25 09:47:02 +0200
committerLiang Qi <liang.qi@theqtcompany.com>2015-05-25 09:47:02 +0200
commit6c0d77396f8fa366b5e4b7e4fe90ccd3110d5258 (patch)
treedc8f0f8a7a88c421a85cf3c2e65bbd9ab474b87e
parent55a7fc7651136510032166ff24eb5e7e49635145 (diff)
parent6a2c3043e7d49e696821688242b098215bd677fa (diff)
Merge remote-tracking branch 'origin/5.4.2' into 5.45.4
m---------src/3rdparty0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 140893bef70011645c686f5fabe45018dd2e392
+Subproject 85973dd6b8b9bd9fea0a9b3e9441919d8da1097