]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ba387c2 5ab697b)
Merge branch 'master' into terencehill/scoreboard_ui
authorterencehill <piuntn@gmail.com>
Sat, 11 Jun 2022 19:18:19 +0000 (21:18 +0200)
committerterencehill <piuntn@gmail.com>
Sat, 11 Jun 2022 19:18:19 +0000 (21:18 +0200)
1  2 
qcsrc/client/hud/panel/scoreboard.qc patch | diff1 | diff2 | blob | history
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/client/view.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/scoreboard.qc
Simple merge
diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/client/view.qc
Simple merge