]> 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: 3aed2c6 e3f69d9)
Merge branch 'master' into z411/bai-server
authorz411 <z411@omaera.org>
Wed, 4 Jan 2023 01:18:45 +0000 (22:18 -0300)
committerz411 <z411@omaera.org>
Wed, 4 Jan 2023 01:18:45 +0000 (22:18 -0300)
1  2 
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
xonotic-server.cfg patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/client.qc
Simple merge
diff --cc xonotic-server.cfg
Simple merge