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 |
||
|---|---|---|
| .. | ||
| depthcharge.scm | ||
| extlinux.scm | ||
| grub.scm | ||
| u-boot.scm | ||