diff options
| author | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
|---|---|---|
| committer | Mark H Weaver <mhw@netris.org> | 2015-04-17 09:54:11 -0400 |
| commit | 933204e5b1473a54367aef1f90de22424e9074ab (patch) | |
| tree | d0ccfee2b903c5fac827bc4a52ec7de17bdc1e7b /THANKS | |
| parent | 9128e323c0a23243c3f70b1716c68ad0b241f30d (diff) | |
| parent | 5e25ebe2fa70297d094fe891b81c4970e45a906a (diff) | |
Merge branch 'master' into core-updates
Conflicts:
gnu-system.am
gnu/packages/gstreamer.scm
Diffstat (limited to 'THANKS')
| -rw-r--r-- | THANKS | 1 |
1 files changed, 1 insertions, 0 deletions
@@ -29,6 +29,7 @@ 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> Bruno Félix Rezende Ribeiro <oitofelix@gnu.org> Cyrill Schenkel <cyrill.schenkel@gmail.com> |