]> 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: cb67dc7 6f84334)
Merge remote branch 'origin/divVerent/nixnex-fixes'
authorRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 08:39:53 +0000 (10:39 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Wed, 24 Aug 2011 08:39:53 +0000 (10:39 +0200)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

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