Merge from trunk

[disorder] / CHANGES.html

diff --git a/CHANGES.html b/CHANGES.html
index 173c81d..8b0b28f 100644 (file)
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -164,6 +164,11 @@ span.command {
         </tr>
 
         <tr>
+          <td><a href="http://code.google.com/p/disorder/issues/detail?id=43">#43</a></d>
+          <td>decoder segfault with FLAC 1.2.1</td>
+        </tr>
+
+        <tr>
           <td><a href="http://code.google.com/p/disorder/issues/detail?id=44">#44</a></d>
           <td>gcc 4.3.2-1ubuntu12 SUYB patch</td>
         </tr>
@@ -172,6 +177,12 @@ span.command {
           <td><a href="http://code.google.com/p/disorder/issues/detail?id=45">#45</a></d>
           <td>disobedience doesn't configure its back end</td>
         </tr>
+
+        <tr>
+          <td><a href="http://code.google.com/p/disorder/issues/detail?id=48">#48</a></d>
+          <td>build-time dependency on <tt>oggdec</tt> removed</td>
+        </tr>
+
         
       </table>