]> 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: eb5cffe ce810ce)
Merge branch 'master' into Mario/teams_bitflag 335/head
authorMario <mario@smbclan.net>
Wed, 13 Jul 2016 09:05:20 +0000 (19:05 +1000)
committerMario <mario@smbclan.net>
Wed, 13 Jul 2016 09:05:20 +0000 (19:05 +1000)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/cl_client.qc
Simple merge