Skip to content
Snippets Groups Projects
Commit c16e0061 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Merge commit '7763118c' 


* commit '7763118c':
  log: Support for 256color terminals

Conflicts:
	doc/APIchanges
	libavutil/log.c
	libavutil/version.h

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 061e340c 7763118c
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
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