From: Samual Lenks Date: Sun, 2 Dec 2012 18:51:36 +0000 (-0500) Subject: Merge remote-tracking branch 'origin/terencehill/scoring_fix' X-Git-Tag: xonotic-v0.7.0~199 X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=eaba531cbf3cade051b2ea59974e8889c0e47e55;p=xonotic%2Fxonotic-data.pk3dir.git Merge remote-tracking branch 'origin/terencehill/scoring_fix' --- eaba531cbf3cade051b2ea59974e8889c0e47e55