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

Merge commit 'f2960097'


* commit 'f2960097':
  bink: fix a check for the first frame.
  doc/developer: Drop obsolete MPlayer reference
  doc/developer: Add ISC license to list of acceptable licenses
  doc/developer: Add web links for all suggested licenses

Conflicts:
	doc/developer.texi

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents 086566a5 f2960097
No related branches found
No related tags found
No related merge requests found
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment