diff options
| author | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:46:23 +0200 |
|---|---|---|
| committer | Gunnar Sletta <gunnar.sletta@nokia.com> | 2011-09-13 10:46:23 +0200 |
| commit | 21a2ce41a8efb6c5ab4ab2674458309bc9f031b7 (patch) | |
| tree | 927045bf52f3367551cb4af17aa6b5738408c1bb /src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri | |
| parent | e47eb9057bf08834885ba6ef5e593d6f1844405c (diff) | |
| parent | af711da1389c86c969d4872ec0936a90c46e1343 (diff) | |
Merge branch 'refactor'
Conflicts:
src/qt-compositor/compositor_api/waylandcompositor.cpp
src/qt-compositor/wayland_wrapper/wloutput.cpp
Diffstat (limited to 'src/plugins/platforms/wayland/gl_integration/xcomposite_share/xcomposite_share.pri')
0 files changed, 0 insertions, 0 deletions