diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-03-04 23:27:24 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-03-04 23:27:24 +0100 |
| commit | 81eec00cb221231123b74d14245ef7caa9d89ff6 (patch) | |
| tree | 3beeb77c5535038dc75db843dd88a1775fb541bb /COPYING | |
| parent | 8689a1908a8353b80ed1fcbb81feddc5eb799f24 (diff) | |
| parent | 2a1e82bb5c2ae28b0018aa765cff6733136b3f70 (diff) | |
| download | guix-81eec00cb221231123b74d14245ef7caa9d89ff6.tar.gz guix-81eec00cb221231123b74d14245ef7caa9d89ff6.zip | |
Merge branch 'master' into core-updates
Conflicts:
Makefile.am
guix/scripts/gc.scm
guix/scripts/package.scm
guix/ui.scm
tests/guix-package.sh
Diffstat (limited to 'COPYING')
0 files changed, 0 insertions, 0 deletions