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

Merge commit '46ce9ded' 


* commit '46ce9ded':
  tiff: K&R formatting cosmetics

Conflicts:
	libavcodec/tiff.c
	libavcodec/tiff.h
	libavcodec/tiffenc.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 2976e2a1 46ce9ded
No related branches found
No related tags found
Expand all 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