Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 00:12:50 +0000 (01:12 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 25 Feb 2015 00:12:50 +0000 (01:12 +0100)
commit2fbdf30efe994a9956a27d845010b57a5fc1deeb
tree4f7577ac1a6c527c9d6744755490167f142ddece
parent53dd75e91154100a83b11f6ef9dfd15d79bcc3aa
parentb31328d008985f87f0a7c83c700847cef1a4f08c
Merge commit 'b31328d008985f87f0a7c83c700847cef1a4f08c'

* commit 'b31328d008985f87f0a7c83c700847cef1a4f08c':
  xcbgrab: Provide better names for the y and x option

Conflicts:
doc/indevs.texi
libavdevice/x11grab.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
doc/indevs.texi
libavdevice/x11grab.c
libavdevice/xcbgrab.c