Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:47:32 +0000 (21:47 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:51:34 +0000 (21:51 +0200)
commit1fc396318833280a520bf568d5605791decf87d7
tree78af0fc0254e2ba38d8911d8d76986cd842bfb90
parent65c9e2d0030d76c055461e25e22b9e8fa641560d
parent7bb505a33ca131906b2ceb2f298e104c862740ea
Merge commit '7bb505a33ca131906b2ceb2f298e104c862740ea'

* commit '7bb505a33ca131906b2ceb2f298e104c862740ea':
  x11grab: Drop a spurious space in the extension reporting message

Conflicts:
libavdevice/x11grab.c

See: 9af209712099699d717596f55b08b3bac8b6b563
Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavdevice/x11grab.c