Closed adrianopol closed 1 year ago
:umbrella: The latest upstream change (presumably these) made this pull request unmergeable. Please resolve the merge conflicts.
:umbrella: The latest upstream change (presumably these) made this pull request unmergeable. Please resolve the merge conflicts.
Please exclude changes in build-3rdparty.py and compose-libs.py and rebase on fresh master.
Other than this, LGTM.
Please also rollback changes in:
:umbrella: The latest upstream change (presumably these) made this pull request unmergeable. Please resolve the merge conflicts.
pcm_mapper_func_gen.py
,atomic_ops_gen.py
,generate_samples.py
,generate_headers.py
: they're modified extremely rarely, they work, and I don't want to touch them without a reason. Also I find indented version less readable in this case.