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
@@ -64,7 +64,7 @@ stdenv.mkDerivation rec {
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
}
+1 -1
View File
@@ -72,7 +72,7 @@ let
license = "GPLv3+";
maintainers = [ stdenv.lib.maintainers.ludo ];
maintainers = [ ];
};
};
in