]> 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: 88be595 e63ba76)
Merge branch 'master' of http://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Sat, 11 May 2013 11:45:17 +0000 (13:45 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 11 May 2013 11:45:17 +0000 (13:45 +0200)
1  2 
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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