diff options
author | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:51:37 +0200 |
---|---|---|
committer | Liang Qi <liang.qi@qt.io> | 2016-05-19 21:51:37 +0200 |
commit | e2f08aaacb571c1287217b09acf66518ff924dc4 (patch) | |
tree | 87cea42340eb474c1cf1a45c19e5fa2f4963a414 /tests/manual/dwmfeatures/main.cpp | |
parent | 8e816f25034287bb3f89317a631075533914102b (diff) | |
parent | 3dd2b06debd316e3656d433686642ffb64951c37 (diff) |
Merge remote-tracking branch 'origin/5.6' into 5.7v5.7.0-rc1
Conflicts:
.qmake.conf
Change-Id: I80957f4153719692cf2deede03ad09634c702fea
Diffstat (limited to 'tests/manual/dwmfeatures/main.cpp')
0 files changed, 0 insertions, 0 deletions