Fix merge conflict
authorterencehill <piuntn@gmail.com>
Tue, 29 Nov 2011 18:11:19 +0000 (19:11 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 29 Nov 2011 18:11:19 +0000 (19:11 +0100)
commit0b1b5021f6f2049b4d2d9187d5eb04c9af6d441d
treea953ce1ea44e929e200d450d7ffb3f1351b36f21
parentc93acc75bbbbbd94e50a25efeaba3ad0be2e4d41
Fix merge conflict
defaultXonotic.cfg