Merge commit '1ec335513f95bf2441f81d761ea127325ecd81a0'

Browse Source

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

Conflicts:
	libavutil/time.c

See: ebef9f5a56

Merged-by: Michael Niedermayer <michaelni@gmx.at>

...

This commit is contained in:

Michael Niedermayer 2014-09-08 22:12:57 +02:00

parent 1360db7e88 1ec335513f

commit 6daff3bd8f

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available