Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 16:29:11 +0000 (17:29 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Wed, 27 Nov 2013 16:29:11 +0000 (17:29 +0100)
commitb723c4e67e20eb86673316cb944184d0f3f6fe5e
tree4caa4c7dd12a17309089fb1db9cb7028036fc31d
parent808c10e728db2d92ccbb0f8b3bcd4a2f4305a2cf
parentfa515c2088e1d082d45741bbd5c05e13b0500804
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  doc/platform: Update to reflect current MSVC build situation

Conflicts:
doc/platform.texi

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