Autres/Rivendellaudio
1
0
Fork 0
mirror of https://github.com/ElvishArtisan/rivendell.git synced 2025-12-21 08:01:16 +01:00
Code Issues Projects Releases Wiki Activity

Fixed conflict in 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason
2020-04-08 18:33:04 -04:00
parent 0ae0b38840 d7253e31c1
commit 48d29d9c75
2 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@@ -19749,7 +19749,6 @@
* Fixed a regression in rdairplay(1) that caused two events to be
started by a single spacebar tap if a SoundPanel event had been
played previously.
<<<<<<< HEAD
2020-04-08 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in rdlogmanager(1) that caused the initial event
in an imported set to fail receive the proper time and transition
@@ -19764,3 +19763,6 @@
2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Fixed a bug in rdairplay(1) with HourSelector::updateTimeData()
where timer was not set properly when crossing midnight.
2020-04-08 Patrick Linstruth <patrick@deltecent.com>
* Modified rdairplay(1) to always scroll log to the top when using
the hour selector.