]> 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: 34f4781 0d5fba7)
Merge branch 'master' into Mario/no_engine_physics
authorMario <mario.mario@y7mail.com>
Sat, 31 Dec 2022 03:45:37 +0000 (13:45 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 31 Dec 2022 03:45:37 +0000 (13:45 +1000)
1  2 
xonotic-client.cfg patch | diff1 | diff2 | blob | history

diff --cc xonotic-client.cfg
Simple merge