Michael Niedermayer a125f87ac4 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>

2014-06-23 01:30:35 +02:00

13 KiB

Raw Blame History

View Raw