]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 730cb7d)
Merge branch 'ipc'
authorAndre <maan@p133.(none)>
Tue, 21 Feb 2006 08:20:30 +0000 (09:20 +0100)
committerAndre <maan@p133.(none)>
Tue, 21 Feb 2006 08:20:30 +0000 (09:20 +0100)
Conflicts:

configure.ac
error.h

Fix these conflicts.


No differences found
paraslash - network audio streaming tools