]> git.sesse.net Git - ffmpeg/commit
Merge commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361'
authorDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 16:35:30 +0000 (17:35 +0100)
committerDerek Buitenhuis <derek.buitenhuis@gmail.com>
Wed, 13 Apr 2016 16:35:40 +0000 (17:35 +0100)
commit89ec4d46eedf0c4876d8942ff5616a40c2641af0
tree6faf003f52953c6ba9147ef5eac3af8854a0bb24
parente5bb7d98f8c0a345b39ac872967f1edddb8f8bb8
parent2f4a1bb9bfb29112711ba904e1dc0dd58e24f361
Merge commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361'

This commit is a no-op.

* commit '2f4a1bb9bfb29112711ba904e1dc0dd58e24f361':
  cmdutils: update copyright year to 2016

Merged-by: Derek Buitenhuis <derek.buitenhuis@gmail.com>