]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: e3cb629 82eb9ce)
Merge remote branch 'origin/fruitiex/add_soundchan'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:56:31 +0000 (09:56 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:56:31 +0000 (09:56 +0100)

Trivial merge