Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Dec 2012 14:28:35 +0000 (15:28 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 3 Dec 2012 14:28:35 +0000 (15:28 +0100)
commitd0b7e832fecab33799bb1fc5e0c032119bc34b33
tree33340fd771c36265c628169793a790eb6907dd89
parent8bee8f778ae1f7f5aec699f53c7bfa09ef0907c7
parenteb7018d2fcd4a665a8c2b65e1c73c3fe9f7ca356
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  configure: Strip ordinals from mingw generated def files
  configure: arm: detect default thumb state of compiler

Conflicts:
configure

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