]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/updatecommands
authorSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:47:52 +0000 (11:47 -0500)
committerSamual <samual@xonotic.org>
Wed, 4 Jan 2012 16:47:52 +0000 (11:47 -0500)
commit45f0125a66587eb0df12844e90b5c84c4357391b
tree43560fd5f1c92dd88323cab54485832112b45598
parentc5fece79dd031dbfaf29160ef33e537b8d12d818
parent10279a8bed152f21526af3b06cc7eaf218734d07
Merge remote branch 'origin/master' into samual/updatecommands
qcsrc/server/defs.qh