OSDN Git Service

(root) / android-x86 / external-ffmpeg.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d8b4ba3 fe533ff)
Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Dec 2013 18:54:04 +0000 (19:54 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 18 Dec 2013 18:54:04 +0000 (19:54 +0100)
* qatar/master:
  Prepare release notes for Libav 10 "Eks"

Conflicts:
doc/RELEASE_NOTES

Not merged because all that stuff has been in past releases

Merged-by: Michael Niedermayer <michaelni@gmx.at>

Trivial merge
external/ffmpeg
About OSDN
Find Software
Develop Software
Help