Fixed conflict in ChangeLog

This commit is contained in:
Fred Gleason
2015-04-02 15:44:48 -04:00
6 changed files with 104 additions and 23 deletions

View File

@@ -14837,3 +14837,15 @@
2015-03-10 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'lib/rdcdplayer.cpp' that threw a segfault
when opening the ripper with no CD inserted under RHEL 7.
2015-03-16 Fred Gleason <fredg@paravelsystems.com>
* Added 'DESCRIPTION', 'OUTCUE', 'FILENAME' and '*_POINT' fields
to the 'Cart CSV Report' in 'rdlibrary/list_reports.cpp'.
2015-03-17 Fred Gleason <fredg@paravelsystems.com>
* Updated 'get_distro.sh' to detect RHEL 7 correctly.
2015-03-23 Fred Gleason <fredg@paravelsystems.com>
* Fixed a fencepost bug in 'ripcd/sasusi.cpp' that caused the
last relay in the list to fail to respond to a 'GO' RML.
2015-04-02 Fred Gleason <fredg@paravelsystems.com>
* Modified the definition of the 'JACK_CLIENTS.COMMAND_LINE'
field from 'char(255)' to 'text' in the database.
* Incremented the database version to 244.