]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 4007372 8ed3353)
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)
1  2 
qcsrc/client/mapvoting.qc patch | diff1 | diff2 | blob | history
qcsrc/common/minigames/minigame/bd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/mapvoting.qc
Simple merge
diff --cc qcsrc/common/minigames/minigame/bd.qc
Simple merge