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

Merge commit 'a6674d2e' 


* commit 'a6674d2e':
  xcbgrab: XCB-based screen capture

Conflicts:
	Changelog
	configure
	libavdevice/Makefile
	libavdevice/alldevices.c
	libavdevice/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents a050cf0c a6674d2e
No related branches found
No related tags found
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