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

Removed residual Git merge markers from 'ChangeLog'

Browse Source
This commit is contained in:
Fred Gleason
2020-05-12 13:30:47 -04:00
parent 34038bc4f3
commit 254671f6a8
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@@ -19245,7 +19245,6 @@
* Added an rdsoftkeys(1) man page. * Added an rdsoftkeys(1) man page.
2019-10-31 Fred Gleason <fredg@paravelsystems.com> 2019-10-31 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.0. * Incremented the package version to 3.2.0.
<<<<<<< HEAD
2019-11-20 Fred Gleason <fredg@paravelsystems.com> 2019-11-20 Fred Gleason <fredg@paravelsystems.com>
* Added interlocks to the 'Edit Switcher' and 'Edit Serial Ports' * Added interlocks to the 'Edit Switcher' and 'Edit Serial Ports'
dialogs in rdadmin(1) to prohibit use of a disabled serial device. dialogs in rdadmin(1) to prohibit use of a disabled serial device.
@@ -19534,7 +19533,6 @@
* Cleaned up a compiler warning in 'lib/rdcae.cpp'. * Cleaned up a compiler warning in 'lib/rdcae.cpp'.
2020-02-07 Fred Gleason <fredg@paravelsystems.com> 2020-02-07 Fred Gleason <fredg@paravelsystems.com>
* Incremented the package version to 3.2.1int1. * Incremented the package version to 3.2.1int1.
<<<<<<< HEAD
2020-02-07 Fred Gleason <fredg@paravelsystems.com> 2020-02-07 Fred Gleason <fredg@paravelsystems.com>
* Removed Q3Support dependencies from the 'Editing Feed' dialog * Removed Q3Support dependencies from the 'Editing Feed' dialog
in rdadmin(1). in rdadmin(1).