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)
commit28904978148cc4aad0f65bbc1fba94c65e18d1cf
tree3aa4cf67db2b30cb1bb2181004a43928f0f430c3
parenta9a2dd52922b74460ded8c2a6961b5d2871e9740
parent294a6d5a6b209ad84ee3bfda9cf2ca84b92c7f9d
Merge remote branch 'origin/master' into samual/grenadelauncher_lifetime_bounce
qcsrc/server/autocvars.qh
qcsrc/server/w_grenadelauncher.qc