diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:30:35 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-06-23 01:30:35 +0200 |
| commit | a125f87ac49b18c57a0bedb6ce44329a4aa70cef (patch) | |
| tree | b6d1ad90d60944ce6d6588b0259b33b63ec627b6 /CREDITS | |
| parent | 49f1b869b60f27ac450f3db301b46d56e5d5aca6 (diff) | |
| parent | 463a7cde563fd805864c48a76dd1b03fc24671ed (diff) | |
| download | ffmpeg-a125f87ac49b18c57a0bedb6ce44329a4aa70cef.tar.gz | |
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>
Diffstat (limited to 'CREDITS')
0 files changed, 0 insertions, 0 deletions