]> 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: 3ec9f80 93c5ad5)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sun, 16 Jun 2013 02:22:37 +0000 (12:22 +1000)
committerMario <mario.mario@y7mail.com>
Sun, 16 Jun 2013 02:22:37 +0000 (12:22 +1000)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history

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