summaryrefslogtreecommitdiffstats
path: root/qtx11extras
diff options
context:
space:
mode:
authorOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-09-18 12:00:07 +0200
committerOswald Buddenhagen <oswald.buddenhagen@theqtcompany.com>2015-09-18 12:00:07 +0200
commit2068af50ca9eb8895e34cb60f67942e100c60432 (patch)
tree31c5f51e2bcb74b660fe4013f29c417e71215012 /qtx11extras
parent1d3966833b5f27fb262f2d3727557ef2c8947828 (diff)
parent2ebfdb4ca80f6738c2720cb261c19fecd65b8b62 (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts: .gitmodules qtquickcontrols2 qtwebview Change-Id: Ic5b78f36511d5e022aacd6ade5d052345bc84d14
Diffstat (limited to 'qtx11extras')
0 files changed, 0 insertions, 0 deletions