Commit 057c5d2e authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '72e228b2'

* commit '72e228b2':
  nut: K&R formatting cosmetics

Conflicts:
	libavformat/nut.c
Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 86c9cf64 72e228b2
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