]> 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: 371637c 47cc62c)
Merge branch 'master' into TimePath/guide
authorotta8634 <k9wolf@pm.me>
Tue, 13 May 2025 13:02:08 +0000 (21:02 +0800)
committerotta8634 <k9wolf@pm.me>
Tue, 13 May 2025 13:02:08 +0000 (21:02 +0800)
1  2 
qcsrc/menu/xonotic/_mod.inc patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/_mod.qh patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/mainwindow.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/menu/xonotic/_mod.inc
Simple merge
diff --cc qcsrc/menu/xonotic/_mod.qh
Simple merge
diff --cc qcsrc/menu/xonotic/mainwindow.qc
Simple merge