aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-05-04 23:46:44 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-05-04 23:46:44 +0200
commitebd74c42a259b77b549a9135c1099921de5d3e0e (patch)
treebb37ebf66a920fb6059b2a159a8dca21e3ca3374
parent0597f052372b9e5877af7ad8b1e632d511931db6 (diff)
parent1f5678c5e404ebd326f6eae1b527beadaa85a528 (diff)
downloadffmpeg-ebd74c42a259b77b549a9135c1099921de5d3e0e.tar.gz
Merge commit '1f5678c5e404ebd326f6eae1b527beadaa85a528' into release/1.1
* commit '1f5678c5e404ebd326f6eae1b527beadaa85a528': Update Changelog for v9.13 Conflicts: Changelog Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions