]> git.tue.mpg.de Git - paraslash.git/commitdiff
Merge branch 't/flac'
authorAndre Noll <maan@systemlinux.org>
Tue, 29 Nov 2011 07:36:49 +0000 (08:36 +0100)
committerAndre Noll <maan@systemlinux.org>
Tue, 29 Nov 2011 07:41:33 +0000 (08:41 +0100)
1  2 
NEWS
aft.c

diff --cc NEWS
index 0b8b33e8d2a5034be6b171335cc032be003aafdc,a79cc29ff044e1bd5f23b3eb5da65cb636ecad5f..8bb2862e93012c815d50be0513dee99c2b8eda87
--- 1/NEWS
--- 2/NEWS
+++ b/NEWS
@@@ -2,6 -2,6 +2,10 @@@
  0.4.9 (to be announced) "hybrid causality"
  ------------------------------------------
  
++Support for another audio format and many small improvements/fixes
++all over the place.
++
++      - Support for flac, the free lossless audio codec.
        - Fix for an endless loop in the mp3 decoder for certain
          (corrupt) mp3 files.
        - autogen.sh now detects a distcc setup and adjusts the
diff --cc aft.c
Simple merge