]> 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: 1ab0ddd 606b7d7)
Merge branch 'master' into mirceakitsune/per_character_sounds
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 4 May 2010 13:43:55 +0000 (16:43 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Tue, 4 May 2010 13:43:55 +0000 (16:43 +0300)
1  2 
qcsrc/server/cl_client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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