]> 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: 4f920ae 9b985a9)
Merge remote branch 'origin/pooga/freezetagbots' after adjusting history
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:26:28 +0000 (10:26 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 20 Jun 2011 08:26:47 +0000 (10:26 +0200)

Trivial merge