diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2013-11-23 22:30:10 +0100 |
| commit | 53c85e97dcc264da5ff5cd4e3be4d47028f4d726 (patch) | |
| tree | 8984fefeb61e0c165bf960fdfa3cd11355d02ba3 /Makefile.am | |
| parent | 2e838890ff989128e8a78eea574d1ad158dd6361 (diff) | |
| parent | c320011da5e743f47220f380c818e95394f6d9c0 (diff) | |
| download | guix-53c85e97dcc264da5ff5cd4e3be4d47028f4d726.tar.gz | |
Merge branch 'core-updates'
Conflicts: gnu/packages/gnunet.scm
Diffstat (limited to 'Makefile.am')
0 files changed, 0 insertions, 0 deletions