Fixed conflicts in 'ChangeLog'

This commit is contained in:
Fred Gleason
2019-07-27 17:29:49 -04:00
29 changed files with 216 additions and 217 deletions

View File

@@ -18883,3 +18883,5 @@
2019-07-23 Dennis Graiani <dennis.graiani@gmail.com>
* Modified rdwavefile.cpp to set Segue End marker to the End Audio
marker when importing audio from AudioVAULT.
2019-07-27 Fred Gleason <fredg@paravelsystems.com>
* Fixed regressions that made serial device operation unreliable.