]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into mirceakitsune/weapon_hagar_secondary_load
authorSamual <samual@xonotic.org>
Thu, 21 Apr 2011 02:17:54 +0000 (22:17 -0400)
committerSamual <samual@xonotic.org>
Thu, 21 Apr 2011 02:17:54 +0000 (22:17 -0400)
commitafd46d09866bb25725ff873132683890dbbca098
treef9ac3480ee5f996fcfb646b712cb2d210a9f705a
parent801fd8197b1e453d4abb50413cd2c1014514f95a
parentfc189c1838060ff3e0c395743d385da8c07f5c0e
Merge remote branch 'origin/master' into mirceakitsune/weapon_hagar_secondary_load
defaultXonotic.cfg
qcsrc/server/autocvars.qh