Fixed conflict in ChangeLog

This commit is contained in:
Fred Gleason
2016-04-26 15:58:34 -04:00
2 changed files with 10 additions and 0 deletions

View File

@@ -15087,3 +15087,6 @@
2016-04-26 Fred Gleason <fredg@paravelsystems.com>
* Fixed a bug in 'rdlibrary/edit_cart.cpp' that threw a segfault
when attempting to open multiple carts simultaneously.
2016-04-26 Brian McGlynn <brian.mcglynn@geneseemedia.net>
* Updated lib/rdcae.cpp to return error code when file does not exist
in /var/snd