]> git.tue.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f299d43 b0cbef1)
Merge branch 'maint'
authorAndre Noll <maan@systemlinux.org>
Sun, 6 Apr 2014 06:19:26 +0000 (08:19 +0200)
committerAndre Noll <maan@systemlinux.org>
Sun, 6 Apr 2014 06:19:26 +0000 (08:19 +0200)
1  2 
gui.c patch | diff1 | diff2 | blob | history

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