]> 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: b0ce8be f45f2df)
Merge branch 'master' into mand1nga/bot-navigation-fixes
authormand1nga <mand1nga@xonotic.org>
Sat, 18 Dec 2010 22:14:42 +0000 (19:14 -0300)
committermand1nga <mand1nga@xonotic.org>
Sat, 18 Dec 2010 22:14:42 +0000 (19:14 -0300)

Trivial merge