]> de.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: ad13ea8 62c2c4b)
Merge remote branch 'origin/divVerent/newchannels'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 6 Jul 2011 08:21:41 +0000 (10:21 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 6 Jul 2011 08:21:41 +0000 (10:21 +0200)

Trivial merge