Leo Famulari d227260d2f Merge branch 'master' into core-updates ... 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.		2016-07-22 18:58:31 -04:00
..
images
contributing.texi	doc: Add note on gender-neutral wording.	2016-07-22 15:26:49 +02:00
emacs.texi
environment-gdb.scm
fdl-1.3.texi
guix.texi	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
htmlxref.cnf
local.mk
package-hello.scm