Changeset 93cf43ec in ffmpeg

Timestamp:

Dec 12, 2013, 6:55:06 PM (11 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

7830c882

Parents:

2644df82 (diff), a2eeed61 (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 'a2eeed619de3bb257e82f0e06d1a580101bce54c'

• commit 'a2eeed619de3bb257e82f0e06d1a580101bce54c': changelog: drop redundant new attribute

Conflicts:

Changelog

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

(No files)