]> 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: b96bb30 fdc6550)
Merge branch 'master' into divVerent/csqcmodel
authorRudolf Polzer <divverent@alientrap.org>
Sun, 11 Dec 2011 18:44:10 +0000 (19:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sun, 11 Dec 2011 18:44:10 +0000 (19:44 +0100)
1  2 
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history
qcsrc/server/defs.qh patch | diff1 | diff2 | blob | history

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