From: mand1nga Date: Tue, 30 Aug 2011 02:47:09 +0000 (-0300) Subject: Merge branch 'master' into divVerent/waypointeditor-auto X-Git-Tag: xonotic-v0.6.0~188^2~4^2~3 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=a076c36308f3325e772cb83b8ea92c3d57d3e8dd;p=xonotic%2Fxonotic-data.pk3dir.git Merge branch 'master' into divVerent/waypointeditor-auto --- a076c36308f3325e772cb83b8ea92c3d57d3e8dd