]> git.tuebingen.mpg.de Git - paraslash.git/commit - openssl.c
projects / paraslash.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9b0f28f ac289a2)
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)
commite2e1adca824585eeecd091f54955e51212927533
tree7448cacce7a882d94d609887b3147a4d1540ac76tree | snapshot
parent9b0f28f5286a1cc8aa5c4a886aadf25900d475bacommit | diff
parentac289a22fd438a97d5eda86793a47377d0d570cecommit | diff
Merge branch 'refs/heads/t/mixer'

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.
NEWS.md diff1 | diff2 | blob | history
mixer.c diff1 | diff2 | blob | history
paraslash - network audio streaming tools