]> 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: 21403f1 72e1cbd)
Merge branch 'master' into mirceakitsune/damage_effects
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 15:41:30 +0000 (17:41 +0200)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Mon, 9 Jan 2012 15:41:30 +0000 (17:41 +0200)
1  2 
qcsrc/dpdefs/csprogsdefs.qc patch | diff1 | diff2 | blob | history
qcsrc/server/cl_player.qc patch | diff1 | diff2 | blob | history

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