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)
* qatar/master:
  x86inc: Remove .rodata kludges

Conflicts:
libavutil/x86/x86inc.asm

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

Simple merge