]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 174e032 bd55215)
Merge branch 'master' into next
authorAndre Noll <maan@systemlinux.org>
Fri, 21 Aug 2009 19:30:36 +0000 (21:30 +0200)
committerAndre Noll <maan@systemlinux.org>
Fri, 21 Aug 2009 19:30:36 +0000 (21:30 +0200)
1  2 
daemon.c patch | diff1 | diff2 | blob | history

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