Merge branch 'ladi-1.126' into 'ladi-1.126-external-jackdbus'
commit05ecb34ca937cfa4c9f9f22b76d55dfdc2bc8eb2
authorNedko Arnaudov <nedko@nedk.org>
Sat, 2 Dec 2023 17:59:35 +0000 (2 19:59 +0200)
committerNedko Arnaudov <nedko@nedk.org>
Sat, 2 Dec 2023 17:59:35 +0000 (2 19:59 +0200)
treed9bbe71ea0ca44a1fdf5bf61035c2ee36340d4d9
parent38f6be46f69fd61872a2140e40396eeb287ca37c
parent1e2bc13a5a94f9ea42586f844bc1215cc33e10bb
Merge branch 'ladi-1.126' into 'ladi-1.126-external-jackdbus'
server/controlapi.c
server/engine.c