Merge 'master' into staging and re-revert merge

... from staging to master, reverted temporarily in aa9a04883e.
This commit is contained in:
Vladimír Čunát
2016-06-23 12:09:03 +02:00
526 changed files with 5888 additions and 4415 deletions
@@ -12,7 +12,7 @@ stdenv.mkDerivation rec {
buildInputs = [ cmake pkgconfig zlib curl elfutils python libiberty binutils ];
meta = with stdenv.lib; {
description = "code coverage tester for compiled programs, Python scripts and shell scripts";
description = "Code coverage tester for compiled programs, Python scripts and shell scripts";
longDescription = ''
Kcov is a code coverage tester for compiled programs, Python