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
..
build	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
packages	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
services	services: Export *-service-type and *-configuration.	2016-07-21 18:53:27 +02:00
system	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
tests	Merge branch 'master' into core-updates	2016-07-20 11:42:17 +02:00
artwork.scm
local.mk	Merge branch 'master' into core-updates	2016-07-22 18:58:31 -04:00
packages.scm	Merge branch 'master' into core-updates	2016-06-27 09:30:01 +02:00
services.scm	gnu: Use 'gexp->file' in conjunction with 'with-imported-modules'.	2016-07-12 22:47:08 +02:00
system.scm	system: Honor the 'dependencies' field of file systems.	2016-07-18 01:26:03 +02:00
tests.scm	services: <shepherd-service> no longer has an 'imported-modules' field.	2016-07-12 22:47:08 +02:00