summaryrefslogtreecommitdiffstats
path: root/src/3rdparty
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-06-30 13:50:07 +0000
committerThe Qt Project <gerrit-noreply@qt-project.org>2015-06-30 13:50:07 +0000
commitc0d5f7e6c10e56777b025b83a1fc53c610927714 (patch)
tree214c8e6892a039997dacbbce33e3814e34bbd301 /src/3rdparty
parentb6690b2334a6004ba7281cdfb34046e98e475502 (diff)
parentcba8f2605f34649e3ca2a767edc7ac9509e7fee9 (diff)
Merge "Merge remote-tracking branch 'origin/5.5' into dev" into refs/staging/dev
Diffstat (limited to 'src/3rdparty')
m---------src/3rdparty0
1 files changed, 0 insertions, 0 deletions
diff --git a/src/3rdparty b/src/3rdparty
-Subproject 0decf91700ad48612b885a549e79bb6252196d4
+Subproject 85827b2c3db3c4cb6308ce8a4c2069c0e403cd9