Merge remote-tracking branch 'origin/Mario/typo_fix', fixes #1963
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:15:00 +0000 (11:15 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:15:00 +0000 (11:15 +0200)
* origin/Mario/typo_fix:
  Fix a minor typo reported in #1949

1  2 
defaultXonotic.cfg

Simple merge