Merge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 18:35:26 +0000 (20:35 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Jul 2014 18:36:31 +0000 (20:36 +0200)
commit15e933b77365b20e3365b1de5b806493494a709f
tree240026b6450fa103f09ddf4ebba269cb0cbf872e
parentb8cdf0472674223227ee52e466eb75fe590a707c
parent6cc1409ba8650fb7eaedc96e970664febc02a5e9
Merge commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9'

* commit '6cc1409ba8650fb7eaedc96e970664febc02a5e9':
  examples/output: Remove unused variable

See: 9b211c43dc5f2e618f204c4a7fd184eb2ea51f02
Merged-by: Michael Niedermayer <michaelni@gmx.at>