]> 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: ba7b3e1 c6edebc)
Merge branch 'master' into Mario/xonoticless_fix
authorMario <mario@smbclan.net>
Mon, 24 Oct 2016 22:59:40 +0000 (08:59 +1000)
committerMario <mario@smbclan.net>
Mon, 24 Oct 2016 22:59:40 +0000 (08:59 +1000)
1  2 
qcsrc/lib/warpzone/server.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/lib/warpzone/server.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge