]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitc0d4211cc0400146d46a49e0e6e0218925eaaf48
tree545585f30673e9b54b57076739281ea6f49fe136
parent3cf245349909435623403b183e4090fd5ff898bd
parentb337a217c74b0d55be5fa4202d04fd9c8968c7a7
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
defaultXonotic.cfg