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
qcsrc/server/w_grenadelauncher.qc

Simple merge
Simple merge