]> 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: 3d64caf 0929efe)
Merge branch 'master' into samual/flyingspectators
authorSamual <samual@xonotic.org>
Thu, 20 Jan 2011 18:50:47 +0000 (13:50 -0500)
committerSamual <samual@xonotic.org>
Thu, 20 Jan 2011 18:50:47 +0000 (13:50 -0500)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_physics.qc patch | diff1 | diff2 | blob | history

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