]> git.sesse.net Git - ffmpeg/commit
Merge commit '7b0b5bc810cdb9ef100492c9a9f2d30602c04336'
authorMark Thompson <sw@jkqxz.net>
Tue, 16 Jan 2018 23:01:20 +0000 (23:01 +0000)
committerMark Thompson <sw@jkqxz.net>
Tue, 16 Jan 2018 23:01:20 +0000 (23:01 +0000)
commit68de778ccc35bea885a989e47358089da006a8b6
tree3b431d591c55ae3d9fff0cc554833f6c3444899a
parent725ae0e2d0222f81b5cca3b0b226116ec6fd0494
parent7b0b5bc810cdb9ef100492c9a9f2d30602c04336
Merge commit '7b0b5bc810cdb9ef100492c9a9f2d30602c04336'

* commit '7b0b5bc810cdb9ef100492c9a9f2d30602c04336':
  cmdutils: update copyright year to 2018

This commit is a noop, see bddf31ba7570325dd2c8d033eae3d0dd74127f96

Merged-by: Mark Thompson <sw@jkqxz.net>