]> 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: b49ceab e11a031)
Merge remote-tracking branch 'origin/master' into Mario/domination_mutator
authorSamual Lenks <samual@xonotic.org>
Mon, 4 Feb 2013 21:49:01 +0000 (16:49 -0500)
committerSamual Lenks <samual@xonotic.org>
Mon, 4 Feb 2013 21:49:01 +0000 (16:49 -0500)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/scores_rules.qc patch | diff1 | diff2 | blob | history

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