]> de.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: 5fe4805 1f18405)
Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divVerent@xonotic.org>
Mon, 10 Oct 2011 10:06:31 +0000 (12:06 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Mon, 10 Oct 2011 10:06:31 +0000 (12:06 +0200)
1  2 
qcsrc/server/cl_physics.qc patch | diff1 | diff2 | blob | history

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