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 /AUTHORS | |
| parent | da5538ef44bfa74d3e435f9f557374eabba5dc1e (diff) | |
| parent | 5dae0186dea1e72e73bf223161620cfeddef5a63 (diff) | |
| download | guix-66ea98e321e93b0806f6870d77dd4c00e7e720c0.tar.gz | |
Merge branch 'master' into core-updates
Conflicts: gnu/packages/image.scm
Diffstat (limited to 'AUTHORS')
| -rw-r--r-- | AUTHORS | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/AUTHORS b/AUTHORS index 1ba9798e7e..4e3d0aa001 100644 --- a/AUTHORS +++ b/AUTHORS @@ -10,6 +10,7 @@ alphabetical order): Eric Bavier <bavier@member.fsf.org> Taylan Ulrich Bayirli/Kammer <taylanbayirli@gmail.com> + Marek Benc <merkur32@gmail.com> Ludovic Courtès <ludo@gnu.org> John Darrington <jmd@gnu.org> Andreas Enge <andreas@enge.fr> |