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	gnu: Add configuration for depthcharge bootloader.	2019-04-03 18:21:42 +02:00
extlinux.scm	bootloader: Mark "grub.cfg" and "extlinux.conf" as non-substitutable.	2020-01-03 16:06:26 +01:00
grub.scm	Merge branch 'master' into core-updates	2020-04-08 13:00:50 +02:00
u-boot.scm	gnu: Add u-boot-cubietruck-bootloader.	2020-02-02 00:37:27 +01:00