]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/minigames/minigame/c4.qc
Merge branch 'master' into terencehill/csqc_input_stuff 872/head
authorterencehill <piuntn@gmail.com>
Wed, 6 Jan 2021 14:41:19 +0000 (15:41 +0100)
committerterencehill <piuntn@gmail.com>
Wed, 6 Jan 2021 14:41:19 +0000 (15:41 +0100)
commit11c1e5406dbf0b528412666a46a91f32f458a2c1
tree2a782068bab011cf41ca33e3902f2898b868973c
parent4007372efa4f5a012028d366bca3ba3ff6199d34
parent8ed3353314a7a50059c3856005a0f933cfa806b7
Merge branch 'master' into terencehill/csqc_input_stuff
qcsrc/client/mapvoting.qc
qcsrc/common/minigames/minigame/bd.qc