]> 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: 8368a96 71ca250)
Merge branch 'master' into martin-t/limit
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Mar 2020 14:19:14 +0000 (15:19 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 26 Mar 2020 14:19:14 +0000 (15:19 +0100)
1  2 
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/defs.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge