]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 6bd2d66 33aab1d)
Merge remote branch 'origin/mirceakitsune/gametypefilter_teamspawns'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 8 Feb 2011 09:25:40 +0000 (10:25 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 8 Feb 2011 09:25:40 +0000 (10:25 +0100)

Trivial merge