Merge branch 'refs/heads/t/mixer-fix'
authorAndre Noll <maan@tuebingen.mpg.de>
Sat, 23 Mar 2019 16:42:12 +0000 (17:42 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sat, 23 Mar 2019 16:42:12 +0000 (17:42 +0100)
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.

1  2 
mixer.c

diff --cc mixer.c
Simple merge