]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/hud_updates
authorSamual <samual@xonotic.org>
Sun, 23 Oct 2011 03:50:55 +0000 (23:50 -0400)
committerSamual <samual@xonotic.org>
Sun, 23 Oct 2011 03:50:55 +0000 (23:50 -0400)
commit9a41842c89f620a0cae9e11dc33aa70cc9dd8e72
tree8a0dcf3309167aae9aa0ec1573eb29f2b9461dcb
parent5b7fb4af768b381b9094adba6e2914ef223c5b80
parent2c21917a15a968e4a714b732d490c9bf85b3d702
Merge remote branch 'origin/master' into samual/hud_updates
defaultXonotic.cfg
qcsrc/server/g_damage.qc