]> 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: f185dad 6ac5ecf)
Merge branch 'master' of /var/cache/git/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Sat, 31 Dec 2011 09:16:29 +0000 (10:16 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 31 Dec 2011 09:16:29 +0000 (10:16 +0100)
1  2 
qcsrc/csqcmodellib/cl_player.qc patch | diff1 | diff2 | blob | history

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