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

Merge commit '1399931d' 


* commit '1399931d':
  x86: dsputil: Rename dsputil_mmx.h --> dsputil_x86.h

Conflicts:
	libavcodec/x86/dsputil_mmx.c

Merged-by: default avatarMichael Niedermayer <michaelni@gmx.at>
parents b2da63db 1399931d
No related branches found
No related tags found
Hide whitespace changes
Inline Side-by-side
Showing
with 19 additions and 19 deletions
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