]> 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: e8229f4 4016ae2)
Merge remote branch 'refs/remotes/origin/terencehill/numbered_bots'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:07:42 +0000 (21:07 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 18 May 2010 19:07:42 +0000 (21:07 +0200)

Trivial merge