diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-02-22 00:27:57 +0100 |
| commit | b2bfa32d253337a48f3bc0260982cbb945b345a3 (patch) | |
| tree | a75ae018b5c7608414bf50bd6e55683eb0c44f7a /nix/sync-with-upstream | |
| parent | 99662b8dbf420d0112f83b7daddcecfb1bcb9bad (diff) | |
| parent | 2096ef47aad57a9988c8fdfaa46a70770a0e0b12 (diff) | |
| download | guix-b2bfa32d253337a48f3bc0260982cbb945b345a3.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu-system.am
Diffstat (limited to 'nix/sync-with-upstream')
0 files changed, 0 insertions, 0 deletions