Vadim Zeitlin b2cdd287bb Resolve change log conflict with master ...

Reapply the change log change manually to master version of the file to
let the CI builds merge this branch automatically.

2018-12-20 02:24:49 +01:00

..

msvc/wx

Introduce MSW ARM64 support

2018-09-17 22:34:32 +02:00

wx

Resolve change log conflict with master

2018-12-20 02:24:49 +01:00