]> 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: 20d1c69 1123945)
Merge branch 'master' into Mario/event_heal
authorMario <mario@smbclan.net>
Sun, 17 Jun 2018 07:16:51 +0000 (17:16 +1000)
committerMario <mario@smbclan.net>
Sun, 17 Jun 2018 07:16:51 +0000 (17:16 +1000)
1  2 
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_damage.qc
Simple merge