]> 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, 20 Feb 2013 20:19:42 +0000 (15:19 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 20 Feb 2013 20:19:42 +0000 (15:19 -0500)
commit2316f8469c5be7383b5537e9425442e6678e0bf1
treefd5fee82f54183690ac1b595aabfe6186e3f6ba1
parent2077350c86a422f25651fe5405cca738d382317a
parent2fa15cdcb207001089b18ea2ff4f4594736b0eda
Merge remote-tracking branch 'origin/master' into samual/notification_rewrite
defaultXonotic.cfg
qcsrc/client/csqcmodel_hooks.qc