Commit e1f98f22 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '76efedea'

* commit '76efedea':
  qdm2: formatting cosmetics

Conflicts:
	libavcodec/qdm2.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents d28a8ad8 76efedea
This diff is collapsed.
Markdown is supported
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