]> 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: b0b4d6b e6bb286)
Merge remote-tracking branch 'origin/master' into Mario/mutators
authorSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 19:20:05 +0000 (15:20 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 8 Aug 2013 19:20:05 +0000 (15:20 -0400)
1  2 
defaultXonotic.cfg patch | diff1 | diff2 | blob | history
qcsrc/client/projectile.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc defaultXonotic.cfg
Simple merge
diff --cc qcsrc/client/projectile.qc
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge