]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1b25fe7 9c06f44)
Merge branch 'master' into next
authorAndre Noll <maan@tuebingen.mpg.de>
Sun, 25 May 2025 17:11:17 +0000 (19:11 +0200)
committerAndre Noll <maan@tuebingen.mpg.de>
Sun, 25 May 2025 17:11:17 +0000 (19:11 +0200)
* master:
  Introduce VSS_NEW_AUDIO_FILE to fix playlist updates.

1  2 
aft.c patch | diff1 | diff2 | blob | history
m4/lls/server_cmd.suite.m4 patch | diff1 | diff2 | blob | history

diff --cc aft.c
Simple merge
diff --cc m4/lls/server_cmd.suite.m4
Simple merge
paraslash - network audio streaming tools