]> 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: 101207b 3977301)
Merge remote branch 'origin/master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Mon, 16 May 2011 17:38:53 +0000 (13:38 -0400)
committerSamual <samual@xonotic.org>
Mon, 16 May 2011 17:38:53 +0000 (13:38 -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