diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-15 16:08:59 +0200 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-04-15 19:22:39 +0200 |
| commit | 17b37f7e907d10d028b70f43b8afc80a384519a4 (patch) | |
| tree | ef2a85fb3f970db164c1c73a973cea0d9dbdc157 /src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h | |
| parent | 1c5581d4d666b61878f1f89655bd69fbb3813eb8 (diff) | |
| parent | e7a1e121d9cb92e89e53baba81aceedca24f2b94 (diff) | |
Merge remote-tracking branch 'origin/stable' into dev
also amended the libhybris plugin according to the merged change.
Change-Id: I2987043cf21936aa0f221343d00dacdc574be06a
Diffstat (limited to 'src/hardwareintegration/client/wayland-egl/qwaylandeglwindow.h')
0 files changed, 0 insertions, 0 deletions