]> 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: db899da ef0b180)
Merge remote branch 'origin/master' into mirceakitsune/damage_effects
authorSamual <samual@xonotic.org>
Fri, 20 Jan 2012 01:16:35 +0000 (20:16 -0500)
committerSamual <samual@xonotic.org>
Fri, 20 Jan 2012 01:16:35 +0000 (20:16 -0500)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/server/vehicles/raptor.qc patch | diff1 | diff2 | blob | history

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