Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 20:26:51 +0000 (21:26 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 27 Oct 2014 20:26:51 +0000 (21:26 +0100)
commita38a1d516fe68542523c772af27e41f28ae9852c
tree64cf1ee6d3cec0693a3f837c0d1bfde574f30346
parenta050cf0c451bdf1c1bd512c4fce6b6f8a5e85102
parenta6674d2e7771dbf7a4a5556f5e126be83cadac96
Merge commit 'a6674d2e7771dbf7a4a5556f5e126be83cadac96'

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

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

Merged-by: Michael Niedermayer <michaelni@gmx.at>
Changelog
configure
libavdevice/Makefile
libavdevice/alldevices.c
libavdevice/version.h
libavdevice/xcbgrab.c