Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 23:08:57 +0000 (01:08 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 28 Aug 2014 23:08:57 +0000 (01:08 +0200)
commit7771daaea7d524e97fe37ad604b67ba859635791
tree44f910fc2c4d10a67283e2ca8055001f6478b8e8
parent39cd9fdbf80292b3cf0aab20cacfdb18e85bb2b9
parent9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5
Merge commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5'

* commit '9e8bbe7d4d1dcd5fec491dbfbb98ed2038a7bed5':
  license: Mention that vf_interlace is GPL, not LGPL

Conflicts:
LICENSE.md

Merged-by: Michael Niedermayer <michaelni@gmx.at>
LICENSE.md