]> 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: 0102957 565a952)
Merge remote-tracking branch 'origin/master' into terencehill/MOTD_bugfix
authorSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 20:25:55 +0000 (16:25 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 22 Apr 2013 20:25:55 +0000 (16:25 -0400)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

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