Skip to content

Merge main to develop #185

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
kanjoe24 merged 9 commits into from
Jan 8, 2026
Merged

Merge main to develop #185

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
fdb362c
Deploy cla action
rdkcmf-jenkins May 29, 2025
16515f3
Merge pull request #147 from rdkcentral/feature/action-deploy-for/main
sbarre01 May 29, 2025
ea262e7
Deploy cla action
rdkcmf-jenkins Sep 25, 2025
6362c5d
Merge pull request #172 from rdkcentral/feature/actions/main-cla
Alan-Ryan Sep 25, 2025
68e436a
Revert "Deploy cla action"
Alan-Ryan Sep 30, 2025
66a27dc
Merge pull request #173 from rdkcentral/revert-172-feature/actions/ma…
Alan-Ryan Sep 30, 2025
59a6e46
CHANGELOG.md 6.0.1
kanjoe24 Jan 6, 2026
282bd17
Merge branch 'main' into release/6.0.1
kanjoe24 Jan 6, 2026
af2fbac
Merge pull request #184 from rdkcentral/release/6.0.1
kanjoe24 Jan 7, 2026
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
12 changes: 11 additions & 1 deletion CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,18 @@ All notable changes to this project will be documented in this file. Dates are d

Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).

#### [6.0.0](https://github.com/rdkcentral/rdk-halif-device_settings/compare/5.1.0...6.0.0)
#### [6.0.1](https://github.com/rdkcentral/rdk-halif-device_settings/compare/6.0.0...6.0.1)

- gh#179: Add dsVIDEO_FRAMERATE_59 and dsVIDEO_FRAMERATE_23 enums [`#181`](https://github.com/rdkcentral/rdk-halif-device_settings/pull/181)
- Deploy cla action [`#175`](https://github.com/rdkcentral/rdk-halif-device_settings/pull/175)
- Merge tag '6.0.0' into develop [`#146`](https://github.com/rdkcentral/rdk-halif-device_settings/pull/146)
- Add dsVIDEO_FRAMERATE_59 and dsVIDEO_FRAMERATE_23 enums [`4eb4046`](https://github.com/rdkcentral/rdk-halif-device_settings/commit/4eb40462561cdebdd0532e55277482870d75bc76)

### [6.0.0](https://github.com/rdkcentral/rdk-halif-device_settings/compare/5.1.0...6.0.0)

> 23 May 2025

- Release/6.0.0 [`#145`](https://github.com/rdkcentral/rdk-halif-device_settings/pull/145)
- gh #142 change state diagram to mermaid [`#144`](https://github.com/rdkcentral/rdk-halif-device_settings/pull/144)
- gh #127 correct mermaid code space issue [`#143`](https://github.com/rdkcentral/rdk-halif-device_settings/pull/143)
- gh #139 Additional FrameRate and VRR status header update [`#135`](https://github.com/rdkcentral/rdk-halif-device_settings/pull/135)
Expand Down