Ludovic Courtès a9db7d10b6 Merge branch 'master' into core-updates ... Conflicts: Makefile.am gnu/packages/autotools.scm gnu/packages/guile.scm gnu/packages/python.scm gnu/packages/shishi.scm guix/gnu-maintenance.scm guix/scripts/build.scm guix/scripts/gc.scm guix/scripts/package.scm guix/scripts/substitute-binary.scm guix/ui.scm nix/nix-daemon/guix-daemon.cc test-env.in tests/nar.scm tests/store.scm		2013-04-26 16:43:08 +02:00
..
packages	Merge branch 'master' into core-updates	2013-04-26 16:43:08 +02:00
system	Add (gnu system vm).	2013-02-27 20:55:40 +01:00
packages.scm	ui: Add a 'define-diagnostic' macro.	2013-04-21 08:08:40 +00:00