Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'
authorMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 22:44:58 +0000 (00:44 +0200)
committerMichael Niedermayer <michael@niedermayer.cc>
Thu, 23 Jul 2015 22:44:58 +0000 (00:44 +0200)
commitda8b70b810bb2703f976d737af8c68d35716f5ea
treedbd741734e9104e47e8297c7bb4f9f5b4043cc3f
parentc6965f62a2e34667814ab1854a9f127e2ea54efa
parenta54e720e0289433d6bc3f7ba0a37fa5cabfaeea9
Merge commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9'

* commit 'a54e720e0289433d6bc3f7ba0a37fa5cabfaeea9':
  configure: force -nologo- when detecting MSVC

Conflicts:
configure

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