]> 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: 264bfe3 ef7fb74)
Merge branch 'master' into Mario/monsters
authorMario <mario.mario@y7mail.com>
Sat, 1 Jun 2013 20:01:59 +0000 (06:01 +1000)
committerMario <mario.mario@y7mail.com>
Sat, 1 Jun 2013 20:01:59 +0000 (06:01 +1000)
1  2 
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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