Marius Bakke 84157bb8bf Merge branch 'master' into core-updates ... Most conflicts are from 6fd52309b8.		2017-03-30 22:59:53 +02:00
..
build
packages	Merge branch 'master' into core-updates	2017-03-30 22:59:53 +02:00
services	services: Add inetd-service-type.	2017-03-24 17:45:56 +01:00
system	system: grub: Don't attempt to load non-EFI modules on EFI.	2017-03-25 22:50:24 +01:00
tests	services: Add inetd-service-type.	2017-03-24 17:45:56 +01:00
artwork.scm
local.mk	Merge branch 'master' into core-updates	2017-03-30 22:59:53 +02:00
packages.scm
services.scm
system.scm
tests.scm