[FFmpeg-cvslog] Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'

Michael Niedermayer git at videolan.org
Thu Apr 11 22:30:07 CEST 2013


ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu Apr 11 22:04:50 2013 +0200| [b2175b0f2a7cfdcc784ec2eabab4f6da3b0e6979] | committer: Michael Niedermayer

Merge commit '93e65e9a6c0895f869752a66731d9b2ec3916467'

* commit '93e65e9a6c0895f869752a66731d9b2ec3916467':
  Cosmetics, restore alphabetic order in atomics lists.

Conflicts:
	libavutil/Makefile

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

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





More information about the ffmpeg-cvslog mailing list