Vadim Zeitlin 6bdab7b3c8 Merge branch 'master' into web-request ...

Merge with the latest master in preparation for merging into master.

Rebake to resolve conflicts in generated files.

2020-12-12 18:12:25 +01:00

..

chkconf.h

Merge wxQT branch into the trunk.

2014-08-24 01:50:11 +00:00

config_android.h

Merge wxQT branch into the trunk.

2014-08-24 01:50:11 +00:00

setup.h

Merge branch 'master' into web-request

2020-12-12 18:12:25 +01:00