]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
authorSamual Lenks <samual@xonotic.org>
Wed, 24 Oct 2012 21:40:34 +0000 (17:40 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 24 Oct 2012 21:40:34 +0000 (17:40 -0400)
commit5ba31b8d5680bf6dc5505a5131ee7af55889ff61
tree271221dd0efefd23499eeb3cd78179c287e5f8e5
parent5e0e1e6c08882641b637d8067f89e628a85850f8
parentb389aba1bd8f5cfbabf3f5958f0e430f202bdff0
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
commands.cfg
defaultXonotic.cfg
qcsrc/server/w_tuba.qc