Merge branch 'divVerent/desktopfullscreen'
authorRudolf Polzer <divverent@xonotic.org>
Sun, 29 Sep 2013 11:49:44 +0000 (13:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sun, 29 Sep 2013 11:49:44 +0000 (13:49 +0200)
1  2 
defaultXonotic.cfg

Simple merge