Commit 6daff3bd authored by Michael Niedermayer's avatar Michael Niedermayer

Merge commit '1ec33551'

* commit '1ec33551':
  time: Add missing zero

Conflicts:
	libavutil/time.c

See: ebef9f5aMerged-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parents 1360db7e 1ec33551
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