From: Richard Kettlewell <rjk@greenend.org.uk>
Date: Sun, 20 Apr 2008 12:32:05 +0000 (+0100)
Subject: Merge fixes up to 3.0.1
X-Git-Tag: 4.0~118
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~mdw/git/disorder/commitdiff_plain/566145652162e02433c1cd461bf9b5e312abbc40?ds=inline

Merge fixes up to 3.0.1
---

566145652162e02433c1cd461bf9b5e312abbc40
diff --cc CHANGES
index 0acc6f9,f8e7ae7..19c04bd
--- a/CHANGES
+++ b/CHANGES
@@@ -1,21 -1,7 +1,25 @@@
 +* Changes up to version 3.1
 +
 +** Server
 +
 +The 'gap' directive will no longer work.  It could be restored if there
 +is real demand.
 +
 +*** Random Track Choice
 +
 +This has been completely rewritten to support new features:
 +   - tracks in the recently-played list or in the queue are no longer
 +     eligible for random choice
 +   - there is a new 'weight' track preference allowing for non-uniform
 +     track selection.  See disorder(1) for details.
 +   - there is a new configuration item replay_min defining the minimum
 +     time before a played track can be picked at random.  The default is
 +     8 hours (which matches the earlier behaviour).
 +
+ * Changes up to version 3.0.1
+ 
+ Debian upgrades from 2.0.x should now work better.
+ 
  * Changes up to version 3.0
  
  Important!  See README.upgrades when upgrading.