Merge commit 'origin/master' into diabolik/pyriaplayermodel
authorSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 24 May 2010 21:08:37 +0000 (17:08 -0400)
committerSahil Singhal <sahil@sahil-desktop.(none)>
Mon, 24 May 2010 21:08:37 +0000 (17:08 -0400)
1  2 
defaultXonotic.cfg

Simple merge