Merge commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 09:59:50 +0000 (11:59 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 16 Sep 2013 10:01:12 +0000 (12:01 +0200)
commit97f8d9feb75dbb0a6ab7a0d670441583b3d85e0e
tree4ea6185fbea15220c887bc3f226e777573d15896
parent9ea359808572ba5f99d285c5231c02d6b503ed7a
parenta06a5b78e2c3bd2e12aff0627a3b65c6fee555a5
Merge commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5'

* commit 'a06a5b78e2c3bd2e12aff0627a3b65c6fee555a5':
  mathops/x86: work around inline asm miscompilation with GCC 4.8.1

See: 659df32a9d8984081ccd54adc3aee7daeb33388d
Merged-by: Michael Niedermayer <michaelni@gmx.at>