From: mand1nga <mand1nga@xonotic.org>
Date: Mon, 15 Aug 2011 04:56:12 +0000 (-0300)
Subject: Merge branch 'master' into mand1nga/pathfinding-optimizations
X-Git-Tag: xonotic-v0.5.0~140^2~2^2^2
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=b68a7fd5a249e3938f58455d81e90128e5c236b7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into mand1nga/pathfinding-optimizations
---

b68a7fd5a249e3938f58455d81e90128e5c236b7