diff options
author | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:58:16 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-08-01 09:58:20 +0200 |
commit | f3d6e8eed740aff58891827e0061d213a7e512cb (patch) | |
tree | 1beb49aad685e9290418de7d76a97e60f25b6f5e /src | |
parent | 9923fcc616ae014a8e73de29eb64be436fd2794b (diff) | |
parent | b8e24de4ba0876a3686cf5da5b1b6f47603c1bc7 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7
Change-Id: I40c0a665f40015af60c52ba942f4d5da8b14a4d1
Diffstat (limited to 'src')
0 files changed, 0 insertions, 0 deletions