]> 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 | compact (merge: 33c0f26 bc7ab7b)
Merge remote branch 'refs/remotes/origin/mirceakitsune/bots_update'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 10 Jul 2010 20:17:32 +0000 (22:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 10 Jul 2010 20:17:32 +0000 (22:17 +0200)

Trivial merge