]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 659fbb8 c817e92)
Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Fri, 27 Nov 2009 19:55:16 +0000 (20:55 +0100)
committerAndre Noll <maan@systemlinux.org>
Fri, 27 Nov 2009 19:55:16 +0000 (20:55 +0100)
1  2 
vss.c patch | diff1 | diff2 | blob | history

diff --cc vss.c
Simple merge
paraslash - network audio streaming tools