diff options
| author | Paul Olav Tvete <paul.tvete@gmail.com> | 2016-08-26 19:14:40 +0200 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@gmail.com> | 2016-08-26 19:18:59 +0200 |
| commit | ae9bfd29b42156fb8f04dfa60b9e48ce10ebacb8 (patch) | |
| tree | c0412b8670fa3de5e608665b1028d3ff66a90192 /tests/auto/compositor/compositor/tst_compositor.cpp | |
| parent | e23550aaa4336fcba125f81cd498f4a15e41f5b7 (diff) | |
| parent | f21246748ce20cd86346e192fe0c4c76a9b08a7c (diff) | |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: I6784a53fcc2f0f68b8e916181cb8cdef263782b8
Diffstat (limited to 'tests/auto/compositor/compositor/tst_compositor.cpp')
0 files changed, 0 insertions, 0 deletions