diff options
| author | 宋文武 <iyzsong@gmail.com> | 2015-05-23 09:43:12 +0800 |
|---|---|---|
| committer | 宋文武 <iyzsong@gmail.com> | 2015-05-23 09:43:12 +0800 |
| commit | 86a81222cad9841c67e9d9bcd46c567383e9a34f (patch) | |
| tree | d976896cba87c5de65d8fdc4bf0be85880c04153 /THANKS | |
| parent | 3e3d47fc5347a5032fd2039831be1dc1d80576ed (diff) | |
| parent | 8605321dd6f3c42590046be9d69112a8c8cf7cbf (diff) | |
| download | guix-86a81222cad9841c67e9d9bcd46c567383e9a34f.tar guix-86a81222cad9841c67e9d9bcd46c567383e9a34f.tar.gz | |
Merge branch 'master' into gtk-rebuild
Conflicts:
gnu/packages/gtk.scm
Diffstat (limited to 'THANKS')
| -rw-r--r-- | THANKS | 2 |
1 files changed, 2 insertions, 0 deletions
@@ -29,7 +29,9 @@ infrastructure help: Yutaka Niibe <gniibe@fsij.org> Andrei Osipov <andrspv@gmail.com> Adam Pribyl <pribyl@lowlevel.cz> + Pjotr Prins <pjotr.public12@thebird.nl> rekado <rekado@elephly.net> + Joshua Randall <jcrandall@alum.mit.edu> Bruno Félix Rezende Ribeiro <oitofelix@gnu.org> Cyrill Schenkel <cyrill.schenkel@gmail.com> Benno Schulenberg <coordinator@translationproject.org> |