]> 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: e7d7c72 8808636)
Merge branch 'master' into mirceakitsune/per_character_sounds
authorRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 15:35:35 +0000 (17:35 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 9 May 2010 15:35:35 +0000 (17:35 +0200)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

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