Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)
committerunknown <samual@xonotic.org>
Fri, 26 Nov 2010 10:08:00 +0000 (05:08 -0500)
commit959b066c86d4cb5c84d70ffb32630b864ba9cbdc
tree6cffd0e82cb31e3eeb33c21fdda107eab3d93f08
parentb34fc8210b8f92e55a622147b1398f5e2899ab43
parenta8b77d9bb65c2f94eb9bb3395866a47226449c08
Merge remote branch 'origin/master' into samual/keepaway
effectinfo.txt