diff options
| author | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2014-09-11 18:26:28 -0400 |
| commit | 66ea98e321e93b0806f6870d77dd4c00e7e720c0 (patch) | |
| tree | 21778401485e3b8683bbc6a31769233c059683b1 /.gitignore | |
| parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
| parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
| download | guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.zip | |
Merge branch 'master' into core-updates
Conflicts:
gnu/packages/image.scm
Diffstat (limited to '.gitignore')
0 files changed, 0 insertions, 0 deletions