Merge pull request #2991 from xdqi/master
authorHardening <rdp.effort@gmail.com>
Mon, 30 Nov 2015 09:52:40 +0000 (10:52 +0100)
committerHardening <rdp.effort@gmail.com>
Mon, 30 Nov 2015 09:52:40 +0000 (10:52 +0100)
commit8ba1b1cd2e19eed0bdd8fee02c1ef7a893235aa7
treed6f868125411545aea0c89bbc49ec3fd3961b403
parent3375865b52e84f42d0acfc64a73a4218245a028b
parent602d2715a27d8188c81f3357198f24727c69a797
Merge pull request #2991 from xdqi/master

Fix compilation error under Visual Studio 2010