Skip to content

F
ffmpeg.wasm-core
Commit 1d41571b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

Merge commit '3e160652' 

* commit '3e160652':
  cmdutils: update copyright year to 2015.

Conflicts:
	cmdutils.c

See: b8db25a3Merged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents f1098eb9 3e160652
Hide whitespace changes
Inline Side-by-side
Showing with 0 additions and 0 deletions
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment