Merge branch 'master' into staging

This commit is contained in:
Marius Bakke 2019-11-28 00:38:25 +01:00
commit 0897ad7fac
No known key found for this signature in database
GPG key ID: A2A06DF2A33A54FA
115 changed files with 2481 additions and 1060 deletions

View file

@ -143,6 +143,7 @@ joystick, and graphics hardware.")
("glib" ,glib)
("ibus" ,ibus)
("libxkbcommon" ,libxkbcommon)
("libxcursor" ,libxcursor) ; enables X11 cursor support
("wayland" ,wayland)
("wayland-protocols" ,wayland-protocols))
(package-inputs sdl)))