]> git.tuebingen.mpg.de Git - paraslash.git/commitdiff
projects / paraslash.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 94802b0)
Merge branch 'maint'
authorAndre Noll <maan@tuebingen.mpg.de>
Sat, 31 Dec 2016 20:12:33 +0000 (21:12 +0100)
committerAndre Noll <maan@tuebingen.mpg.de>
Sat, 31 Dec 2016 20:12:33 +0000 (21:12 +0100)
A trivial conflict in configure.ac and remove/modify conflicts in
web/index.in.html and NEWS. The last file has been renamed to NEWS.md
in master. The conflict was resolved by copying the new text of the
NEWS file from maint (the release notes for v0.4.14) to NEWS.md and
to adjust the formatting to markdown syntax.


No differences found
paraslash - network audio streaming tools