Marius Bakke 2778302399 Merge branch 'master' into core-updates ... Conflicts: etc/news.scm gnu/local.mk gnu/packages/check.scm gnu/packages/cross-base.scm gnu/packages/gimp.scm gnu/packages/java.scm gnu/packages/mail.scm gnu/packages/sdl.scm gnu/packages/texinfo.scm gnu/packages/tls.scm gnu/packages/version-control.scm		2020-04-08 13:00:50 +02:00
..
depthcharge.scm
extlinux.scm
grub.scm	Merge branch 'master' into core-updates	2020-04-08 13:00:50 +02:00
u-boot.scm