projects
/
xonotic
/
xonotic-data.pk3dir.git
/ commitdiff
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
0840737
ef95da8
)
Merge remote branch 'origin/master' into samual/mutator_ctf
author
Samual <samual@xonotic.org>
Mon, 28 Mar 2011 07:39:30 +0000
(
03:39
-0400)
committer
Samual <samual@xonotic.org>
Mon, 28 Mar 2011 07:39:30 +0000
(
03:39
-0400)
1
2
qcsrc/server/g_damage.qc
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
qcsrc/server/g_damage.qc
Simple merge