[FFmpeg-cvslog] Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
Michael Niedermayer
git at videolan.org
Wed Oct 31 14:01:04 CET 2012
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct 31 13:57:09 2012 +0100| [9766d9c9851577d8162d5f006dffc721902a1409] | committer: Michael Niedermayer
Merge commit '04581c8c77ce779e4e70684ac45302972766be0f'
* commit '04581c8c77ce779e4e70684ac45302972766be0f':
x86: yasm: Use complete source path for macro helper %includes
Conflicts:
Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9766d9c9851577d8162d5f006dffc721902a1409
---
More information about the ffmpeg-cvslog
mailing list