Merge branch 'master' into i3-expose-window-title

This commit is contained in:
Daniel Eklöf 2019-02-12 20:01:01 +01:00
commit bc4f1723d4
4 changed files with 6 additions and 5 deletions

7
.gitmodules vendored
View file

@ -1,3 +1,4 @@
[submodule "external/wlroots"]
path = external/wlroots
url = https://github.com/swaywm/wlroots.git
[submodule "external/wlr-protocols"]
path = external/wlr-protocols
url = https://github.com/swaywm/wlr-protocols.git
branch = master

View file

@ -43,7 +43,7 @@ if (ENABLE_WAYLAND)
wayland_protocol(
wayland_protos
${PROJECT_SOURCE_DIR}/external/wlroots/protocol/wlr-layer-shell-unstable-v1.xml
${PROJECT_SOURCE_DIR}/external/wlr-protocols/unstable/wlr-layer-shell-unstable-v1.xml
${WAYLAND_PROTOCOLS}/stable/xdg-shell/xdg-shell.xml
${WAYLAND_PROTOCOLS}/unstable/xdg-output/xdg-output-unstable-v1.xml
)

1
external/wlr-protocols vendored Submodule

@ -0,0 +1 @@
Subproject commit 4ff1cda832e46fa4c433bbfebb8179f095e60150

1
external/wlroots vendored

@ -1 +0,0 @@
Subproject commit 59d1b6790dd187c2e110e98a2fa17c1fbfee40ca