Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 21:51:44 +0000 (22:51 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 11 Dec 2013 21:52:28 +0000 (22:52 +0100)
commit95ad2483c33a015f4d0da5edddf3bf2fc3890413
tree010a39103aa4ccb7fb10870b120eb3f0610a5000
parent37437d97a8e6c72240c75b0b43fa7cb193f871f7
parent3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26
Merge commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26'

* commit '3bb91a1b5c4a0c5ec9c4d3b6649b23285c3d7f26':
  configure: Add -D__USE_MINGW_ANSI_STDIO=1 to CPPFLAGS on MinGW64

Conflicts:
configure

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