Merge branch 'master' into staging

This commit is contained in:
Luca Bruno
2014-11-10 10:03:52 +01:00
96 changed files with 1773 additions and 516 deletions

View File

@@ -34,7 +34,7 @@ stdenv.mkDerivation {
'';
makePhase = "make all";
makeFlags = "all";
installTargets = "install install-META";