Skip to content
Snippets Groups Projects
Commit a125f87a authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '463a7cde' 


* commit '463a7cde':
  Differentiate assembler and assembly in documentation and comments

Conflicts:
	configure
	doc/platform.texi

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 49f1b869 463a7cde
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment