Merge remote-tracking branch 'origin/master' into hardened-stdenv

2016-05-18 17:10:02 +02:00
parent 9fbc20e2f8 3cd63ade16
commit f8d481754c
1470 changed files with 62103 additions and 28701 deletions
@@ -19,6 +19,5 @@ stdenv.mkDerivation rec {
    description = "a dynamic resource editor for X Toolkit applications";

    platforms = stdenv.lib.platforms.linux;
-    maintainers = [ stdenv.lib.maintainers.simons ];
  };
 }