Ludovic Courtès 01e354eb83 Merge branch 'core-updates' ... Conflicts: guix/build/union.scm		2013-01-11 16:01:49 +01:00
..
boost
libstore
libutil
nix-daemon
scripts
.gitignore
sync-with-upstream