mirror of
https://github.com/ElvishArtisan/rivendell.git
synced 2025-07-24 16:38:13 +02:00
Resolved conflict in 'ChangeLog'
Signed-off-by: Fred Gleason <fredg@paravelsystems.com>
This commit is contained in:
commit
af8393ac32
@ -22831,3 +22831,5 @@
|
||||
* Refactored rdpanel(1) to use 'RDPortNames'.
|
||||
* Removed the 'RDAirPlayConf::portName()' method.
|
||||
* Removed the 'RDAirPlayConf::soundPanelChannelName()' method.
|
||||
2021-12-21 David Klann <dklann@broadcasttool.com>
|
||||
* Add missing files to EXTRA_DIST in versions.
|
||||
|
@ -20,7 +20,10 @@
|
||||
|
||||
EXTRA_DIST = PACKAGE_VERSION\
|
||||
README.txt\
|
||||
RIVWEBPYAPI_VERSION
|
||||
RIVWEBPYAPI_VERSION\
|
||||
RIVWEBCAPI_AGE\
|
||||
RIVWEBCAPI_CURRENT\
|
||||
RIVWEBCAPI_REVISION
|
||||
|
||||
CLEANFILES = *~
|
||||
MAINTAINERCLEANFILES = *~\
|
||||
|
Loading…
x
Reference in New Issue
Block a user