diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-20 23:51:26 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-20 23:51:26 +0100 |
| commit | edae5b3d50692c25e29fe65fdc14ae3ccdce884d (patch) | |
| tree | ec257af3a922fd96bda8b8b16c00c8d0beaf445a /nix | |
| parent | 1dba64079c5aaa1fb40e4b1d989f1f06efd6cb63 (diff) | |
| parent | e3aaefe71bd26daf6fdbfd0634f68a90985e059b (diff) | |
| download | patches-edae5b3d50692c25e29fe65fdc14ae3ccdce884d.tar patches-edae5b3d50692c25e29fe65fdc14ae3ccdce884d.tar.gz | |
Merge branch 'master' into core-updates
Conflicts:
guix/packages.scm
Diffstat (limited to 'nix')
0 files changed, 0 insertions, 0 deletions