diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2012-12-09 23:54:37 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2012-12-09 23:54:37 +0100 |
| commit | 4d152bf1d9ff894119e913e6506632348107cf65 (patch) | |
| tree | c44f06f725e3a398bd7698dd2b58480d356021b8 /distro.scm | |
| parent | 4ce823c4241ff941ca301c39db23ab91eeaa1ac9 (diff) | |
| parent | 3259877d3563ac022633fbd8b73134a10567331e (diff) | |
| download | guix-4d152bf1d9ff894119e913e6506632348107cf65.tar.gz | |
Merge branch 'master' into nix-integration
Conflicts: guix/store.scm
Diffstat (limited to 'distro.scm')
0 files changed, 0 insertions, 0 deletions