From: Timothee "TTimo" Besset <ttimo@ttimo.net>
Date: Sun, 25 Mar 2012 23:33:16 +0000 (-0700)
Subject: Merge pull request #19 from merlin1991/scons-update
X-Git-Tag: xonotic-v0.7.0~16^2~6^2~1
X-Git-Url: https://git.rm.cloudns.org/?a=commitdiff_plain;h=f3eedecd09f6e1cd849bdeb8fe9c5e9762d30fcb;p=xonotic%2Fnetradiant.git

Merge pull request #19 from merlin1991/scons-update

Scons update
---

f3eedecd09f6e1cd849bdeb8fe9c5e9762d30fcb