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)
commit6bded356ec89b1344049ff702e6c6babaeccd439
tree54e1eddefe2acae72199b3f89b3f65a06ff502a3
parent1746ed51956550beb3ea311d99d657221b3a8f1d
parent176d4e57f7381f6215f2baf3b07f859bb4c72e76
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.
mixer.c