Resolved conflict in ChangeLog

This commit is contained in:
Fred Gleason
2014-09-20 22:07:49 -04:00
2 changed files with 4 additions and 1 deletions

View File

@@ -14489,3 +14489,6 @@
2014-09-20 Alban Peignier <alban@tryphon.eu>
* Merged patch from albanpeignier to use global cue assignments
for RDCueEdit, Audition Hea/Tail in RDAirPlay [GitHub issue #000024].
2014-09-19 Alban Peignier <alban@tryphon.eu>
* Fixed 'web/rdxport/carts.cpp' which tried to create associated group
during cart creation