diff options
author | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
---|---|---|
committer | Ludovic Courtès <ludo@gnu.org> | 2013-01-11 16:01:49 +0100 |
commit | 01e354eb83299d00ddd6ba4beb73bac8130beeae (patch) | |
tree | 03368edd8462d818334bec458cd04dc1de4750a1 /guix-build.in | |
parent | bfe384cc4c7e56ac1eceff8b5d92e916507436eb (diff) | |
parent | 28e55604212c01884a77a4f5eb66294c4957c48a (diff) | |
download | patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar patches-01e354eb83299d00ddd6ba4beb73bac8130beeae.tar.gz |
Merge branch 'core-updates'
Conflicts:
guix/build/union.scm
Diffstat (limited to 'guix-build.in')
0 files changed, 0 insertions, 0 deletions