Merge commit '4d05e9392f84702e3c833efa86e84c7f1cf5f612'
authorHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:35:11 +0000 (15:35 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Sun, 29 Nov 2015 14:35:11 +0000 (15:35 +0100)
commit6dce615ee24e5654ec2048eac461babc93da612f
tree67e2cef08d95de74c04c8dab5cb23e35f1430c29
parent7c4d405d404cceba1e071200bd732709b917ea4f
parent4d05e9392f84702e3c833efa86e84c7f1cf5f612
Merge commit '4d05e9392f84702e3c833efa86e84c7f1cf5f612'

* commit '4d05e9392f84702e3c833efa86e84c7f1cf5f612':
  libvpxenc: remove some unused ctrl id mappings

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>