From: Andre Noll <maan@systemlinux.org>
Date: Sun, 1 Dec 2013 00:14:37 +0000 (+0100)
Subject: Merge branch 't/mood_cleanups'
X-Git-Tag: v0.5.1~6
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=3055dabe9c91c9dfaa517ebbb65a9aae5946d018;p=paraslash.git

Merge branch 't/mood_cleanups'

Cooking since 2011-10-13, seems to be fine.

	6bcd10 mood: Deduplicate score formula.
	f24778 mood: Combine compute_num_played_score() and compute_last_played_score().
	62a968 mood: Don't open-code compute_dynamic_score().
	2c85cd mood: Don't add files without valid information to the score table.
	5e9ded mood: Simplify compute_dynamic_score().
	ab9f71 mood.c: Remove unused int_log2().
---

3055dabe9c91c9dfaa517ebbb65a9aae5946d018
diff --cc NEWS
index fc6ccffb,d1155022..980f613a
--- a/NEWS
+++ b/NEWS
@@@ -6,7 -6,6 +6,8 @@@ NEW
  ----------------------------------------------
  
  	- audiod improvements and fixes.
 +	- buffer tree robustness improvements.
++	- cleanup of the mood subsystem.
  
  ----------------------------------------
  0.5.0 (2013-08-23) "invertible validity"