From: terencehill <piuntn@gmail.com>
Date: Sat, 21 Aug 2010 19:42:07 +0000 (+0200)
Subject: Merge branch 'master' into terencehill/screenshot_viewer
X-Git-Tag: xonotic-v0.8.0~139^2~1^2~155^2~53
X-Git-Url: https://git.xonotic.org/?a=commitdiff_plain;h=1e492eabdcef368aba446eaca34dd3b8d54a63a7;p=xonotic%2Fxonotic-data.pk3dir.git

Merge branch 'master' into terencehill/screenshot_viewer
---

1e492eabdcef368aba446eaca34dd3b8d54a63a7