Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Oct 2013 12:27:00 +0000 (14:27 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 9 Oct 2013 12:29:42 +0000 (14:29 +0200)
commit31d0d355608fc9dfaed55b7541f16cd105fb3995
treeadcf71f7da6cdff5a20f048f250ea5cabc35a9e8
parent4ce82e6fa94c96ec2db76ce3be200e58f0a577c3
parentad7d7d4f6a1347d81c349bfbf16632047264e6bf
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  x86inc: Remove .rodata kludges

Conflicts:
libavutil/x86/x86inc.asm

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavutil/x86/x86inc.asm