diff options
| author | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
|---|---|---|
| committer | Vladimír Čunát <vcunat@gmail.com> | 2016-05-23 09:02:10 +0200 |
| commit | 0b192a09767c05b38f3e2838c07e9600318bbbb5 (patch) | |
| tree | 4467053c39ef4bad71527cd5fda5cf92960575e8 /lib | |
| parent | dc5bbc4700dd95420f87141efcc0e6cb48a710f9 (diff) | |
| parent | 0e54c749114b79f6be78486086f5829b176fcba8 (diff) | |
Merge branch 'master' into staging
That's to get mesa rebuild from master, as it's nontrivial.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/maintainers.nix | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/maintainers.nix b/lib/maintainers.nix index b98a0ab76c730..544caabf8e442 100644 --- a/lib/maintainers.nix +++ b/lib/maintainers.nix @@ -86,7 +86,7 @@ couchemar = "Andrey Pavlov <couchemar@yandex.ru>"; cransom = "Casey Ransom <cransom@hubns.net>"; CrystalGamma = "Jona Stubbe <nixos@crystalgamma.de>"; - cstrahan = "Charles Strahan <charles.c.strahan@gmail.com>"; + cstrahan = "Charles Strahan <charles@cstrahan.com>"; cwoac = "Oliver Matthews <oliver@codersoffortune.net>"; DamienCassou = "Damien Cassou <damien@cassou.me>"; dasuxullebt = "Christoph-Simon Senjak <christoph.senjak@googlemail.com>"; @@ -260,6 +260,7 @@ nfjinjing = "Jinjing Wang <nfjinjing@gmail.com>"; nico202 = "Nicolò Balzarotti <anothersms@gmail.com>"; notthemessiah = "Brian Cohen <brian.cohen.88@gmail.com>"; + NikolaMandic = "Ratko Mladic <nikola@mandic.email>"; np = "Nicolas Pouillard <np.nix@nicolaspouillard.fr>"; nslqqq = "Nikita Mikhailov <nslqqq@gmail.com>"; obadz = "obadz <obadz-nixos@obadz.com>"; |