]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Wed, 27 Feb 2013 18:04:16 +0000 (13:04 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 27 Feb 2013 18:04:16 +0000 (13:04 -0500)
1  2 
defaultXonotic.cfg

Simple merge