Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into web-request

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

Rebake to resolve conflicts in generated files.
This commit is contained in:
Vadim Zeitlin
2020-12-12 17:44:45 +01:00
parent 68cbd54db0 86a3578a11
commit 6bdab7b3c8
3934 changed files with 147571 additions and 96246 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
samples/samples.bkl
View File

@@ -103,7 +103,6 @@
other ones.
-->
<if cond="FORMAT[:3] == 'msv'">
<subproject id="flash" template="optsub"/>
<subproject id="mfc" template="optsub"/>
</if>
<subproject id="memcheck" template="optsub"/>