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

Merge commit 'a5f88736' 


* commit 'a5f88736':
  silly typo fixes

Conflicts:
	doc/protocols.texi
	libavcodec/aacpsy.c
	libavformat/utils.c
	tools/patcheck

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 711c8ee7 a5f88736
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 20 additions and 19 deletions
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