Fixed conflicts in 'ChangeLog'

Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
Fred Gleason
2024-05-09 10:17:56 -04:00
4 changed files with 429 additions and 395 deletions

View File

@@ -24765,3 +24765,7 @@
* Fixed a regression in rdairplay(1) that caused the start time
indicators in the button log to display the incorrect color for
hard time events.
2024-05-08 Fred Gleason <fredg@paravelsystems.com>
* Refactored the 'RDEventLine::generateLog()' method to isolate
music selector code into the 'RDEventLine::GenerateMusicSchedEvent()'
method.