mirror of https://github.com/ARMmbed/mbed-os.git
190e77894f
### Description
I would love to make this an error, but we have had a duplicate key in
`targets.json` for a while now. Instead, we're merging in a semi-smart way.
This will allow you to have things like `"target.features_add"` twice, and
both will take affect.
### Pull request type
[x] Fix
[ ] Refactor
[ ] Target update
[ ] Functionality change
[ ] Docs update
[ ] Test update
[ ] Breaking change
|
||
|---|---|---|
| .. | ||
| arm_pack_manager | ||
| bootloaders | ||
| compliance | ||
| config | ||
| data | ||
| debug_tools/crash_log_parser | ||
| dev | ||
| export | ||
| flash_algo | ||
| git_hooks | ||
| host_tests | ||
| importer | ||
| misc | ||
| notifier | ||
| profiles | ||
| resources | ||
| targets | ||
| test | ||
| test_configs | ||
| toolchains | ||
| .mbedignore | ||
| __init__.py | ||
| build.py | ||
| build_api.py | ||
| build_release.py | ||
| build_travis.py | ||
| check_release.json | ||
| check_release.py | ||
| default_settings.py | ||
| detect_targets.py | ||
| device_management.py | ||
| get_config.py | ||
| hooks.py | ||
| libraries.py | ||
| make.py | ||
| memap.py | ||
| memap_flamegraph.html | ||
| options.py | ||
| paths.py | ||
| project.py | ||
| run_icetea.py | ||
| settings.py | ||
| singletest.py | ||
| size.py | ||
| synch.py | ||
| test.py | ||
| test_api.py | ||
| test_db.py | ||
| test_exporters.py | ||
| test_mysql.py | ||
| test_webapi.py | ||
| tests.py | ||
| upload_results.py | ||
| utils.py | ||