[FFmpeg-cvslog] Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'
Michael Niedermayer
git at videolan.org
Thu May 30 10:54:55 CEST 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 30 10:45:47 2013 +0200| [3a0e21f037c082e431eff62c47203cf4d77c88cb] | committer: Michael Niedermayer
Merge commit '186599ffe0a94d587434e5e46e190e038357ed99'
* commit '186599ffe0a94d587434e5e46e190e038357ed99':
build: cosmetics: Place unconditional before conditional OBJS lines
Conflicts:
libavcodec/x86/Makefile
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3a0e21f037c082e431eff62c47203cf4d77c88cb
---
More information about the ffmpeg-cvslog
mailing list