]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 18e45e8 95488d2)
Merge branch 'master' into aac
authorAndre <maan@p133.(none)>
Wed, 10 May 2006 23:08:50 +0000 (01:08 +0200)
committerAndre <maan@p133.(none)>
Wed, 10 May 2006 23:08:50 +0000 (01:08 +0200)
Conflicts:

configure.ac

configure.ac looks fine. Why the hell is git complaining?
nothing to commit


Trivial merge
paraslash - network audio streaming tools