]> 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: a4d023f 338162f)
Merge branch 'terencehill/welcome_dialog_fix' into 'master'
authorterencehill <piuntn@gmail.com>
Tue, 11 Oct 2022 10:49:20 +0000 (10:49 +0000)
committerterencehill <piuntn@gmail.com>
Tue, 11 Oct 2022 10:49:20 +0000 (10:49 +0000)
Fix #2724 "Pressing escape opens wrong menu when watching demos".

Closes #2724

See merge request xonotic/xonotic-data.pk3dir!1058

1  2 
qcsrc/client/main.qc patch | diff1 | diff2 | blob | history
qcsrc/menu/command/menu_cmd.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/main.qc
Simple merge
diff --cc qcsrc/menu/command/menu_cmd.qc
Simple merge