Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:21:47 +0000 (21:21 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 19:21:47 +0000 (21:21 +0200)
commit5393c9dadd23f33ca5e22a904131fccffb7ec070
tree8fd3444321de6bf7f509c93c52ef996f306829ac
parent0ddb0516f11383a4c007bb4738de37a4f85c37c0
parentf07a4290a0e8f31796e348edd3ed06b8d15132d8
Merge commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8'

* commit 'f07a4290a0e8f31796e348edd3ed06b8d15132d8':
  x11grab: K&R formatting cosmetics

Conflicts:
libavdevice/x11grab.c

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