aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-08-12 20:25:20 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-08-12 20:25:48 +0200
commit257188acea8d93218d5bbfc65593567f1f34b4c2 (patch)
treee0f4b998acab7fee6537b2627b1f2a806c11e32f
parent80a77c0c5befee2ca395ad91259385a67a9ed5cb (diff)
parent5a2d1913a96bb0e029b424a4dd5b414cfb91c708 (diff)
downloadffmpeg-257188acea8d93218d5bbfc65593567f1f34b4c2.tar.gz
Merge commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708' into release/0.10
* commit '5a2d1913a96bb0e029b424a4dd5b414cfb91c708': Prepare for 0.8.15 Release Conflicts: RELEASE Not merged Merged-by: Michael Niedermayer <michaelni@gmx.at>
0 files changed, 0 insertions, 0 deletions