Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'
authorMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 21:19:56 +0000 (23:19 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Sun, 26 Jul 2015 21:19:56 +0000 (23:19 +0200)
commit27e61a716c893a6ae67ca8f859c735bc0b0b799a
tree5061f79f4095f0b24d8b261a209cfe6214cea95a
parent867686997cbacd06cf5056c2741494bda23a7819
parent5fd553d31272d5ed42a7a5a0ecaab7b3452da83a
Merge commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a'

* commit '5fd553d31272d5ed42a7a5a0ecaab7b3452da83a':
  configure: Only redefine inline to __inline for msvc if necessary

Conflicts:
configure

Merged-by: Michael Niedermayer <michael@niedermayer.cc>
configure