diff options
author | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
---|---|---|
committer | Eelco Dolstra <eelco.dolstra@logicblox.com> | 2015-10-06 15:24:20 +0200 |
commit | 741bf840dad05cd1728481045466811ae8ae8281 (patch) | |
tree | 93ce9aef00773772dfb9b782f20e20b79f024d48 /lib/maintainers.nix | |
parent | fe195af94462a6769f2e2c38c1d5739337c20d57 (diff) | |
download | nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.gz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.bz2 nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.lz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.xz nixlib-741bf840dad05cd1728481045466811ae8ae8281.tar.zst nixlib-741bf840dad05cd1728481045466811ae8ae8281.zip |
Revert "Merge pull request #9543 from NixOS/staging.post-15.06"
This reverts commit f61176c5396ed513f3d399f73f38ab78a066667f, reversing changes made to a27ca029ee2b39e04d7d2a516a7228f4b62067fb. Conflicts: pkgs/development/libraries/ncurses/default.nix
Diffstat (limited to 'lib/maintainers.nix')
-rw-r--r-- | lib/maintainers.nix | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index 071a4d45ba23..121fca951642 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -144,7 +144,6 @@ jwilberding = "Jordan Wilberding <jwilberding@afiniate.com>"; jzellner = "Jeff Zellner <jeffz@eml.cc>"; kamilchm = "Kamil Chmielewski <kamil.chm@gmail.com>"; - kampfschlaefer = "Arnold Krille <arnold@arnoldarts.de>"; khumba = "Bryan Gardiner <bog@khumba.net>"; kkallio = "Karn Kallio <tierpluspluslists@gmail.com>"; koral = "Koral <koral@mailoo.org>"; @@ -180,7 +179,6 @@ meditans = "Carlo Nucera <meditans@gmail.com>"; meisternu = "Matt Miemiec <meister@krutt.org>"; michelk = "Michel Kuhlmann <michel@kuhlmanns.info>"; - michaelpj = "Michael Peyton Jones <michaelpj@gmail.com>"; mirdhyn = "Merlin Gaillard <mirdhyn@gmail.com>"; mschristiansen = "Mikkel Christiansen <mikkel@rheosystems.com>"; modulistic = "Pablo Costa <modulistic@gmail.com>"; |