Changeset a47dfdfa in ffmpeg

Timestamp:

Mar 13, 2014, 8:01:14 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

4b50de8

Parents:

8b02dfd3 (diff), fb9a5bdc (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 commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3'

• commit 'fb9a5bdc516b75b4ba1e36ca2223dec46571dea3': Prepare for 11_alpha1 Release

Conflicts:

RELEASE

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

(No files)