Merge pull request #6388
c075aa7
workaround for GetObject windows.h macro and rapidjson conflict (xiphon)
pull/235/head
commit
d1cf16364f
Loading…
Reference in new issue