summaryrefslogtreecommitdiffstats
path: root/sync.profile
diff options
context:
space:
mode:
authorLiang Qi <liang.qi@theqtcompany.com>2015-12-01 23:08:05 +0100
committerLiang Qi <liang.qi@theqtcompany.com>2015-12-01 23:08:05 +0100
commitdd5e1ffd3e9e379574325193c8546d453c11303e (patch)
treed7aaaf3ad3098a0086ba15d768f0585fce1ab926 /sync.profile
parentcf450400cad0461a0b4661d31fabd949d69ec772 (diff)
parent4d3c3a08eba8d30805f18397c98e19ab9fd40722 (diff)
Merge remote-tracking branch 'origin/5.6' into dev
Conflicts: src/client/qwaylanddisplay_p.h Change-Id: I602b90a055d1322af369fb7b77a68583154b660f
Diffstat (limited to 'sync.profile')
0 files changed, 0 insertions, 0 deletions