]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mand1nga/bot-fixes-II
authormand1nga <mand1nga@xonotic.org>
Thu, 18 Aug 2011 22:22:08 +0000 (19:22 -0300)
committermand1nga <mand1nga@xonotic.org>
Thu, 18 Aug 2011 22:22:08 +0000 (19:22 -0300)
commit0117479ba4e6b21a3ba53f71b343b85398bdfedc
tree2ca71ae9f7e9700e40642da32a542050017eaa95
parent73619c8944d3467b3678091eac21fcd56c1806f9
parent4a66a9e563f365169902c85f33b3eada7eb73744
Merge branch 'master' into mand1nga/bot-fixes-II