]> 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: 3adfd91 dfd6cc0)
Merge remote branch 'refs/remotes/origin/mirceakitsune/bugfix_bot_forcedteam_clanarena'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:22:01 +0000 (10:22 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:22:01 +0000 (10:22 +0200)

Trivial merge