[FFmpeg-cvslog] Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
Michael Niedermayer
git at videolan.org
Wed Nov 27 02:18:14 CET 2013
ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Nov 27 01:52:55 2013 +0100| [875f9aea3ea0614061e03363cf832f9047a683c9] | committer: Michael Niedermayer
Merge commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c'
* commit 'dc80e2f7a529d6e4416b40b68699be16fed62d6c':
Makefile: Fix building programs on systems with a nonempty executable suffix
Conflicts:
Makefile
See: f1db007e008d3ece791c7ac65c537d1d301ea0cc
Merged-by: Michael Niedermayer <michaelni at gmx.at>
> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=875f9aea3ea0614061e03363cf832f9047a683c9
---
More information about the ffmpeg-cvslog
mailing list