[FFmpeg-cvslog] Merge remote-tracking branch 'qatar/master'

[Michael Niedermayer]

On Wed, Oct 09, 2013 at 02:36:47PM +0200, Michael Niedermayer wrote:
> ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Oct  9 14:27:00 2013 +0200| [31d0d355608fc9dfaed55b7541f16cd105fb3995] | committer: Michael Niedermayer
> 
> Merge remote-tracking branch 'qatar/master'
> 
> * qatar/master:
>   x86inc: Remove .rodata kludges
> 
> Conflicts:
> 	libavutil/x86/x86inc.asm
> 
> Merged-by: Michael Niedermayer <michaelni at gmx.at>

note, if someone still needs these kludges, tell me and ill revert
this

[...]

-- 
Michael     GnuPG fingerprint: 9FF2128B147EF6730BADF133611EC787040B0FAB

It is what and why we do it that matters, not just one of them.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: not available
Type: application/pgp-signature
Size: 198 bytes
Desc: Digital signature
URL: <http://ffmpeg.org/pipermail/ffmpeg-cvslog/attachments/20131009/d94e09d6/attachment.asc>