]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
Merge branch 'refs/heads/t/mixer'
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 15 Mar 2020 14:51:20 +0000 (15:51 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 15 Mar 2020 14:56:36 +0000 (15:56 +0100)
A single patch for para_mixer which makes the subcommands which
sleep a bit more robust.

The merge conflicted due to commit d6b25bf854c1 (mixer: fade: Handle
empty mood strings gracefully) from half a year ago, but the resolution
was obvious.

Cooking for nine months.

* refs/heads/t/mixer:
  mixer: sleep/snooze: Close mixer during sleep.


No differences found