From: Andre Noll <maan@tuebingen.mpg.de>
Date: Sat, 23 Mar 2019 16:42:12 +0000 (+0100)
Subject: Merge branch 'refs/heads/t/mixer-fix'
X-Git-Tag: v0.6.3~46
X-Git-Url: http://git.tue.mpg.de/?a=commitdiff_plain;h=6bded356ec89b1344049ff702e6c6babaeccd439;p=paraslash.git

Merge branch 'refs/heads/t/mixer-fix'

Two bug fixes for the sleep mode of para_mixer.  Started on 2018-07-07,
cooking since 2018-08-19.

* refs/heads/t/mixer-fix:
  mixer: sleep: Change to next file at fade-in time.
  mixer: sleep: Change to fade-in mood later.
---

6bded356ec89b1344049ff702e6c6babaeccd439