Merge branch 'origin/master' into stdenv.

This commit is contained in:
Peter Simons
2013-08-17 10:00:16 +02:00
138 changed files with 149 additions and 147 deletions
+1 -1
View File
@@ -32,6 +32,6 @@ stdenv.mkDerivation rec {
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}
+1 -1
View File
@@ -29,7 +29,7 @@ stdenv.mkDerivation rec {
'';
licenses = [ "GPLv2+" "LGPLv2.1+" ];
maintainers = with stdenv.lib.maintainers; [ sander ludo ];
maintainers = with stdenv.lib.maintainers; [ sander ];
platforms = stdenv.lib.platforms.all;
};
}