Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Apr 2013 11:23:38 +0000 (13:23 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 6 Apr 2013 11:23:38 +0000 (13:23 +0200)
commit84bfa8beb708d7594d298b438d3fa9c21630da97
tree173f86e3bdc612efbbd168245159e14c6d66ed65
parent11d7bbb47a1e8109aef90f62eb63ce0039f23340
parenta862c7d3368241e72a465ab944afa38ea62a6640
Merge commit 'a862c7d3368241e72a465ab944afa38ea62a6640'

* commit 'a862c7d3368241e72a465ab944afa38ea62a6640':
  Integrate lcov/gcov into Libav

Conflicts:
Makefile
common.mak

Merged-by: Michael Niedermayer <michaelni@gmx.at>
.gitignore
Makefile
configure
doc/developer.texi
tests/Makefile