Commit a87cf368 authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '8747fce9'

* commit '8747fce9':
  electronicarts: K&R formatting cosmetics

Conflicts:
	libavformat/electronicarts.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 15677e72 8747fce9
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