Merge commit '463a7cde563fd805864c48a76dd1b03fc24671ed'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 23:30:35 +0000 (01:30 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 22 Jun 2014 23:30:35 +0000 (01:30 +0200)
commita125f87ac49b18c57a0bedb6ce44329a4aa70cef
treeb6d1ad90d60944ce6d6588b0259b33b63ec627b6
parent49f1b869b60f27ac450f3db301b46d56e5d5aca6
parent463a7cde563fd805864c48a76dd1b03fc24671ed
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>
configure
doc/platform.texi