Ludovic Courtès 01e354eb83 Merge branch 'core-updates' ... Conflicts: guix/build/union.scm		2013-01-11 16:01:49 +01:00
..
boost	build: Include a copy of Nix's libstore and daemon; build it.	2012-12-03 23:05:08 +01:00
libstore	build: Include a copy of Nix's libstore and daemon; build it.	2012-12-03 23:05:08 +01:00
libutil	Update license headers.	2013-01-06 00:47:50 +01:00
nix-daemon	daemon: Fix warning message when running as root without a build user group.	2013-01-09 12:16:26 +01:00
scripts	Update license headers.	2013-01-06 00:47:50 +01:00
.gitignore	build: Include a copy of Nix's libstore and daemon; build it.	2012-12-03 23:05:08 +01:00
sync-with-upstream	Update a few more license headers.	2013-01-06 18:43:58 +01:00