summaryrefslogtreecommitdiffstats
path: root/qtmacextras
diff options
context:
space:
mode:
authorFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-04-21 16:26:04 +0200
committerFrederik Gladhorn <frederik.gladhorn@theqtcompany.com>2015-04-21 16:26:04 +0200
commit9edcb248898bb6f515b1ca9068205669b2bf6b9e (patch)
tree6d5ca927eaaed271b9a97befd679d88870eb492f /qtmacextras
parentb34e3669ff5dff4ab791eeb699e5284ed4332dc1 (diff)
parent976ffd988e7ec7b595ed610d86bf58307c5e5434 (diff)
Merge remote-tracking branch 'origin/5.5' into dev
Conflicts: qt3d qtactiveqt qtandroidextras qtbase qtcanvas3d qtconnectivity qtdeclarative qtdoc qtenginio qtimageformats qtlocation qtmacextras qtmultimedia qtqa qtquick1 qtquickcontrols qtrepotools qtscript qtsensors qtserialport qtsvg qttools qttranslations qtwayland qtwebengine qtwebkit qtwebkit-examples qtwebsockets qtwinextras qtxmlpatterns Change-Id: I691dbbe6d3399d601336bb7e309579fb89d6381c
Diffstat (limited to 'qtmacextras')
0 files changed, 0 insertions, 0 deletions