diff options
| author | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:14:47 +0100 |
|---|---|---|
| committer | Oswald Buddenhagen <oswald.buddenhagen@digia.com> | 2014-02-19 10:14:47 +0100 |
| commit | 573d0ee5ba86d99095f217ea9e19172bfc5e75fd (patch) | |
| tree | 81a3f21339610101706f86a3038bae00bad55eef /README | |
| parent | 6d038fb664de833725d13ee6b548d85eabf1ff3a (diff) | |
| parent | aaa81b2bb5eb3b18cb80c71c6730db227f31825f (diff) | |
Merge remote-tracking branch 'origin/dev' into stable
Conflicts:
src/compositor/wayland_wrapper/qwlsurface.cpp
Change-Id: I3b6a4af41f272d3dc7fc920ba2542f2dd7978175
Diffstat (limited to 'README')
| -rw-r--r-- | README | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -17,7 +17,7 @@ make To build the QtWayland module you need the external dependencies: xkbcommon 0.2.0 - http://xkbcommon.org/ -wayland 1.1.0 - http://wayland.freedesktop.org/ +wayland 1.3.0 - http://wayland.freedesktop.org/ We hang out at #qt-labs and #qt-lighthouse on freenode if you have any questions |