[FFmpeg-cvslog] Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203'

Michael Niedermayer git at videolan.org
Mon Jun 24 10:48:31 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Mon Jun 24 10:40:15 2013 +0200| [14a61bc3f9ad68151368bc3577bb26fe1146fbf4] | committer: Michael Niedermayer

Merge commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203'

* commit 'ace87c19ed4c4882d7b9b3ce512c4c195e39a203':
  configure: whitespace cosmetics

Conflicts:
	configure

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=14a61bc3f9ad68151368bc3577bb26fe1146fbf4
---





More information about the ffmpeg-cvslog mailing list