git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/client/vehicles/raptor.qc

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/client/vehicles/raptor.qc

projects / xonotic / xonotic-data.pk3dir.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 900b4e2 0e5d976)

author	Jakob MG <jakob_mg@hotmail.com>
	Tue, 21 Jun 2011 17:29:46 +0000 (19:29 +0200)
committer	Jakob MG <jakob_mg@hotmail.com>
	Tue, 21 Jun 2011 17:29:46 +0000 (19:29 +0200)
commit	add5162c2c034ff0e9eda824d3bf2b82e627be6c
tree	39fcdaa72311376266321a32125b352455c76d10	tree \| snapshot
parent	900b4e2ec77d753cc3463db6f0bc09b8d2303922	commit \| diff
parent	0e5d97682e9478c51d8033a3ab9624471da0579d	commit \| diff

Merge remote branch 'origin/master' into tzork/turrets-csqc

Conflicts:
qcsrc/client/Main.qc
qcsrc/client/damage.qc
qcsrc/qc-client.cbp

qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/qc-client.cbp	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/movelib.qc	diff1 \|	diff2 \|	blob \| history