projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0e4ebf 943e5ba)
Merge remote-tracking branch 'origin/master' into terencehill/spectate_prev
authorSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 01:10:59 +0000 (21:10 -0400)
committerSamual Lenks <samual@xonotic.org>
Wed, 8 May 2013 01:10:59 +0000 (21:10 -0400)
1  2 
qcsrc/client/hud.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/mutators/mutator_superspec.qc patch | diff1 | diff2 | blob | history

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