Changeset 60058c18 in ffmpeg

Timestamp:

Jun 16, 2014, 11:04:41 AM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

8a4a84a7

Parents:

f0fbd910 (diff), 766f2d96 (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.

git-author:

Michael Niedermayer <michaelni@gmx.at> (06/16/14 11:04:36)

git-committer:

Michael Niedermayer <michaelni@gmx.at> (06/16/14 11:04:41)

Message:

Merge commit '766f2d965ff1948749c37f26a714adb8aa89c4a9'

• commit '766f2d965ff1948749c37f26a714adb8aa89c4a9': gitignore: add dylib and swp entries

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

(No files)