Ludovic Courtès 829ecd002e Merge branch 'master' into core-updates ... Conflicts: gnu/packages/libwebsockets.scm		2014-02-27 23:49:30 +01:00
..
packages	Merge branch 'master' into core-updates	2014-02-27 23:49:30 +01:00
services	gnu: Define '%base-services'.	2014-02-19 21:08:28 +01:00
system	gnu: vm: Remove '%demo-operating-system'.	2014-02-19 21:10:12 +01:00
packages.scm	Factorize package search between 'guix package' and 'guix build'.	2013-12-21 22:36:32 +01:00
services.scm	gnu: Introduce the (gnu services ...) modules.	2014-02-19 20:58:24 +01:00
system.scm	Merge branch 'master' into core-updates	2014-02-22 00:27:57 +01:00