Skip to content

manifest: pull removal of zephyr domain patches #17683

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 7, 2024
Merged

manifest: pull removal of zephyr domain patches #17683

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4f50a72
manifest: pull removal of zephyr domain patches
gmarull Oct 7, 2024
11b29fe
doc: nrfxlib: load zephyr domain after doxybridge
gmarull Oct 7, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/nrfxlib/conf.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,11 @@
"sphinxcontrib.mscgen",
"inventory_builder",
"warnings_filter",
"zephyr.domain",
"zephyr.kconfig",
"zephyr.external_content",
"zephyr.doxyrunner",
"zephyr.doxybridge",
"zephyr.domain",
]
master_doc = "README"

Expand Down
2 changes: 1 addition & 1 deletion west.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ manifest:
# https://developer.nordicsemi.com/nRF_Connect_SDK/doc/latest/zephyr/guides/modules.html
- name: zephyr
repo-path: sdk-zephyr
revision: 6f6b0e4ac941540618a5933449538408acc85c7b
revision: ae75e9ebc34cafdcd5b68946026f15d030c5c798
import:
# In addition to the zephyr repository itself, NCS also
# imports the contents of zephyr/west.yml at the above
Expand Down
Loading