diff options
| author | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
|---|---|---|
| committer | Michael Raskin <7c6f434c@mail.ru> | 2013-06-13 17:12:43 +0400 |
| commit | 19530856ed44248c8e14cfc6533b4001318e74d1 (patch) | |
| tree | c5c03ca92fdc6af84cffa33cfd4906846013443c /pkgs/lib | |
| parent | ca67fccbfe867c7594e87b9f842dababbe3c7403 (diff) | |
| parent | 8fe0f0007bb84bafcf5f7209c12c779b24bec7f8 (diff) | |
| download | nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.gz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.bz2 nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.lz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.xz nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.tar.zst nixlib-19530856ed44248c8e14cfc6533b4001318e74d1.zip | |
Merge remote-tracking branch 'upstream/master' into x-updates
Conflicts: pkgs/development/libraries/cairo/default.nix pkgs/development/libraries/gdk-pixbuf/default.nix pkgs/development/libraries/gtk+/2.x.nix pkgs/misc/ghostscript/default.nix pkgs/top-level/all-packages.nix
Diffstat (limited to 'pkgs/lib')
| -rw-r--r-- | pkgs/lib/maintainers.nix | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/pkgs/lib/maintainers.nix b/pkgs/lib/maintainers.nix index e861203fb159..5e506ce25c2a 100644 --- a/pkgs/lib/maintainers.nix +++ b/pkgs/lib/maintainers.nix @@ -8,6 +8,7 @@ all = "Nix Committers <nix-commits@lists.science.uu.nl>"; amiddelk = "Arie Middelkoop <amiddelk@gmail.com>"; andres = "Andres Loeh <ksnixos@andres-loeh.de>"; + amorsillo = "Andrew Morsillo <andrew.morsillo@gmail.com>"; antono = "Antono Vasiljev <self@antono.info>"; astsmtl = "Alexander Tsamutali <astsmtl@yandex.ru>"; aszlig = "aszlig <aszlig@redmoonstudios.org>"; @@ -22,6 +23,7 @@ goibhniu = "Cillian de Róiste <cillian.deroiste@gmail.com>"; guibert = "David Guibert <david.guibert@gmail.com>"; iElectric = "Domen Kozar <domen@dev.si>"; + lovek323 = "Jason O'Conal <jason@oconal.id.au>"; jcumming = "Jack Cummings <jack@mudshark.org>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; ludo = "Ludovic Courtès <ludo@gnu.org>"; |