]> 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: 6f97076 13392e7)
Merge branch 'master' of git://git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Tue, 13 Sep 2011 18:49:23 +0000 (20:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Tue, 13 Sep 2011 18:49:23 +0000 (20:49 +0200)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

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