]> 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: 89dcda1 f010bbd)
Merge remote branch 'origin/mand1nga/bot-navigation-fixes'
authorRudolf Polzer <divverent@alientrap.org>
Sun, 19 Dec 2010 20:34:32 +0000 (21:34 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 19 Dec 2010 20:34:32 +0000 (21:34 +0100)

Trivial merge