aboutsummaryrefslogtreecommitdiffstats
path: root/INSTALL.md
diff options
context:
space:
mode:
authorMichael Niedermayer <michaelni@gmx.at>2014-06-23 01:30:35 +0200
committerMichael Niedermayer <michaelni@gmx.at>2014-06-23 01:30:35 +0200
commita125f87ac49b18c57a0bedb6ce44329a4aa70cef (patch)
treeb6d1ad90d60944ce6d6588b0259b33b63ec627b6 /INSTALL.md
parent49f1b869b60f27ac450f3db301b46d56e5d5aca6 (diff)
parent463a7cde563fd805864c48a76dd1b03fc24671ed (diff)
downloadffmpeg-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 'INSTALL.md')
0 files changed, 0 insertions, 0 deletions