]> 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: a9a2dd5 294a6d5)
Merge remote branch 'origin/master' into samual/grenadelauncher_lifetime_bounce
authorSamual <samual@xonotic.org>
Sun, 3 Jul 2011 09:05:04 +0000 (05:05 -0400)
committerSamual <samual@xonotic.org>
Sun, 3 Jul 2011 09:05:04 +0000 (05:05 -0400)
1  2 
qcsrc/server/autocvars.qh patch | diff1 | diff2 | blob | history
qcsrc/server/w_grenadelauncher.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/autocvars.qh
Simple merge
diff --cc qcsrc/server/w_grenadelauncher.qc
Simple merge