diff options
| author | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-03-08 14:45:49 +0100 |
|---|---|---|
| committer | Paul Olav Tvete <paul.tvete@theqtcompany.com> | 2016-03-08 14:45:49 +0100 |
| commit | 85428526fb3e5a1605e8df2e009d333193809fae (patch) | |
| tree | 08ac5d72c773b2ad9cd27a87e29c5f4055fdbf35 /.gitignore | |
| parent | 95ed69bd08f424b80524414fbc0456f315353cf5 (diff) | |
| parent | 19260d9846861212881e374229798b3863d1a78d (diff) | |
Merge remote-tracking branch 'qt/5.6' into 5.7
Change-Id: Iada0e076ee33e8d39ecc4f40edfd9764ba610c03
Diffstat (limited to '.gitignore')
| -rw-r--r-- | .gitignore | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/.gitignore b/.gitignore index 6681af4ac..8ba7b05c2 100644 --- a/.gitignore +++ b/.gitignore @@ -43,7 +43,7 @@ examples/wayland/server-buffer/compositor/qwayland-server-*.h examples/wayland/server-buffer/compositor/*-server-protocol.h examples/wayland/server-buffer/compositor/*-protocol.c examples/wayland/subsurface/subsurface -src/client/qwayland*.cpp +src/client/qwayland-*.cpp src/client/*-protocol.c src/client/QtWaylandClient.version src/client/QtWaylandClient.version.in |