d227260d2f
Resolved conflicts: * gnu/packages/scheme.scm: Conflict in import of (guix licenses). On master, "#:hide (openssl)" was used. On core-updates, "#:select (some licenses)" was used. The latter won the conflict. * gnu/packages/version-control.scm (git)[arguments]: Whitespace conflict in 'install-shell-completion. |
||
|---|---|---|
| .. | ||
| ant-build-system.scm | ||
| bournish.scm | ||
| cmake-build-system.scm | ||
| cvs.scm | ||
| download.scm | ||
| emacs-build-system.scm | ||
| emacs-utils.scm | ||
| git.scm | ||
| glib-or-gtk-build-system.scm | ||
| gnu-build-system.scm | ||
| gnu-dist.scm | ||
| graft.scm | ||
| gremlin.scm | ||
| haskell-build-system.scm | ||
| hg.scm | ||
| perl-build-system.scm | ||
| profiles.scm | ||
| pull.scm | ||
| python-build-system.scm | ||
| r-build-system.scm | ||
| rpath.scm | ||
| ruby-build-system.scm | ||
| store-copy.scm | ||
| svn.scm | ||
| syscalls.scm | ||
| union.scm | ||
| utils.scm | ||
| waf-build-system.scm | ||