Changeset bbd8fd03 in ffmpeg

Timestamp:

Feb 16, 2014, 1:24:52 AM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

45581ed1

Parents:

1db87da3 (diff), f58dcfb3 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge remote-tracking branch 'qatar/master'

• qatar/master: Prepare for 10_beta1 Release

Conflicts:

RELEASE

merge only for metadata

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

(No files)