]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ca_arena_mutators
authorterencehill <piuntn@gmail.com>
Tue, 12 Feb 2013 14:29:25 +0000 (15:29 +0100)
committerterencehill <piuntn@gmail.com>
Tue, 12 Feb 2013 14:29:25 +0000 (15:29 +0100)
commit2183ba664c674c396a5c37a69a944f4c698eea70
tree5d767a3fef3e19a9d260797d31d3a7500c17cbb1
parentdb5c4d5b616a207cc01a6c0a81c574a572ce0426
parent166e9c67e14a8ab65e883a3824167fbfd62b37c0
Merge branch 'master' into terencehill/ca_arena_mutators
qcsrc/client/autocvars.qh
qcsrc/server/autocvars.qh
qcsrc/server/miscfunctions.qc