]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commitfa0c6afce104a7e0afa9a40c5dc4b7b66d76fa22
tree46c092479ac3f743eb6c65d880abe712024142e6
parentdb899da7ce92a0dc210c3895d5794354c05ff823
parentef0b1804069b8d29084bb863197b371457e669c1
Merge remote branch 'origin/master' into mirceakitsune/damage_effects
defaultXonotic.cfg
qcsrc/server/vehicles/raptor.qc