Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:46:16 +0000 (03:46 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 23 Mar 2014 02:46:40 +0000 (03:46 +0100)
commitacb8d655d7507e4af8c5ba8e0e3a8ed74ce30c94
tree255e766736bcbee5846c016b1bc55e8159a6892a
parent1abb03195930163ba2c5850599c1380bd8b09c58
parentd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b
Merge commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b'

* commit 'd5717bc4e9cc253a933ae8130eea3a9c8bc33c0b':
  changelog: switch libx265 and compand entries

Conflicts:
Changelog

Not many changes as libx265 and compand are placed correctly for us

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