]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote-tracking branch 'origin/master' into divVerent/csad
authorSamual Lenks <samual@xonotic.org>
Tue, 11 Dec 2012 22:17:48 +0000 (17:17 -0500)
committerSamual Lenks <samual@xonotic.org>
Tue, 11 Dec 2012 22:17:48 +0000 (17:17 -0500)
commit5cfaa1de9500e179e6b7fb5b9e48f9410d16aee4
tree8fa299faa6d34e4a1046be25dea8ed87a91e3b0f
parent0b01af33f4f52b0ef253a709602ac53a1f96fb1a
parent591e13cf6bf66a6b14039ce393a5d5dbb9f8bc3c
Merge remote-tracking branch 'origin/master' into divVerent/csad
qcsrc/client/Main.qc
qcsrc/client/autocvars.qh