Merge remote branch 'origin/master' into diabolik/newanims
authorSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 23 May 2011 18:59:05 +0000 (14:59 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 23 May 2011 18:59:05 +0000 (14:59 -0400)
1  2 
defaultXonotic.cfg

Simple merge