Mark H Weaver 3d337bbc39 Merge branch 'master' into core-updates		2016-07-31 23:27:03 -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-31 23:27:03 -04:00
services	services: Export *-service-type and *-configuration.	2016-07-21 18:53:27 +02:00
system	Merge remote-tracking branch 'origin/master' into core-updates	2016-07-28 11:08:55 +02:00
tests	tests: base: Correct invalid merge.	2016-07-30 15:47:28 +02:00
artwork.scm	artwork: Update to latest version.	2015-05-07 23:11:23 +02:00
local.mk	Merge branch 'master' into core-updates	2016-07-31 23:27:03 -04:00
packages.scm	packages: Add 'hidden-package'.	2016-07-28 18:50:43 +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: Source /etc/environment before $HOME/.guix-profile/etc/profile.	2016-07-27 23:08:20 +02:00
tests.scm	services: <shepherd-service> no longer has an 'imported-modules' field.	2016-07-12 22:47:08 +02:00