Michael Niedermayer 2fbdf30efe 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>
2015-02-25 01:12:50 +01:00
..
2015-01-12 01:18:01 +01:00
2014-07-20 02:01:50 +02:00
2015-01-07 17:17:33 -09:00
2015-02-19 11:30:30 +01:00
2014-12-01 00:31:06 +01:00
2015-02-02 05:04:14 +01:00
2014-05-28 03:52:50 +02:00
2014-12-01 00:31:06 +01:00
2014-11-22 02:09:09 +01:00
2015-02-02 05:04:14 +01:00
2014-07-17 11:29:01 +02:00