Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:17:36 +0000 (00:17 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 28 Feb 2015 23:17:36 +0000 (00:17 +0100)
commit8a776726457ad20afc4e7cf9115b309034dd0f25
treecc0ec090115aa63dfc90ab4cffcbd59907b92578
parent7fce8c752d87ca4738179bb7e9238bae67abdeac
parent802987f8c7033ec8b82b35438d3822cf7f761166
Merge commit '802987f8c7033ec8b82b35438d3822cf7f761166'

* commit '802987f8c7033ec8b82b35438d3822cf7f761166':
  x11grab: Unbreak building

Conflicts:
libavdevice/x11grab.c

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