]> 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: 36c5d4c 20f9a12)
Merge remote branches 'origin/fruitiex/hud_damage-dmg_take' and 'origin/divVerent...
authorRudolf Polzer <divverent@alientrap.org>
Tue, 21 Dec 2010 06:17:23 +0000 (07:17 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 21 Dec 2010 06:17:23 +0000 (07:17 +0100)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/g_damage.qc patch | diff1 | diff2 | blob | history

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