From: Andre Noll <maan@systemlinux.org>
Date: Sun, 23 Mar 2014 18:21:37 +0000 (+0100)
Subject: Merge branch 't/fade_improvements'
X-Git-Tag: v0.5.2~7
X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=commitdiff_plain;h=f6a99f9e27cf84d92fc992677dca9578c5a3b585;hp=f6a99f9e27cf84d92fc992677dca9578c5a3b585

Merge branch 't/fade_improvements'

Cooking since 2014-02-08.

* t/fade_improvements:
  fade: Improve error diagnostics.
  fade: Switch to the fade-in mood *before* sleeping.
  fade: Allow to set more than one channel in sleep mode.
  fade: Implement new mode "set".
  fade: Log to stderr.

Conflicts:
	error.h
---