Changeset a125f87a in ffmpeg

Timestamp:

Jun 22, 2014, 11:30:35 PM (10 years ago)

Author:

Michael Niedermayer <michaelni@gmx.at>

Branches:

master

Children:

42e6fc14

Parents:

49f1b869 (diff), 463a7cde (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 '463a7cde563fd805864c48a76dd1b03fc24671ed'

• commit '463a7cde563fd805864c48a76dd1b03fc24671ed': Differentiate assembler and assembly in documentation and comments

Conflicts:

configure
doc/platform.texi

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

(No files)