Merge conflict in changelog

2016-02-04 12:39:18 +00:00
parent e2f8c92e22
commit 68c6bf64c4
2 changed files with 10 additions and 2 deletions
--- a/CHANGELOG.rst
+++ b/CHANGELOG.rst
@@ -3,6 +3,8 @@ sc_usb_audio Change Log

 6.14.2
 ------
+    - ADDED:      Ability to offset DAC data from ADC data. Useful if ADC and DAC do not agree 
+                  on TDM formats as on the xCORE-200-MC-AUDIO board. See I2S_ADC_TO_DAC_SAMP_OFFSET
    - RESOLVED:   DAC data mis-alignment issue in TDM slave mode

 6.14.1