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

Merge commit 'f07a4290' 


* commit 'f07a4290':
  x11grab: K&R formatting cosmetics

Conflicts:
	libavdevice/x11grab.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 0ddb0516 f07a4290
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 139 additions and 134 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