git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 3a2e290 d450d0f)

author	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Sun, 23 Jan 2011 16:01:49 +0000 (18:01 +0200)
committer	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Sun, 23 Jan 2011 16:01:49 +0000 (18:01 +0200)
commit	36810e8ddba12c1959bc07e4c80630454c6f85a8
tree	bb6ea9f8b6dc7101f5824d712dd80b1c457a8a6e	tree \| snapshot
parent	3a2e290a9092f704dffaef8b50fc4be0dca8bb35	commit \| diff
parent	d450d0fb332990c59fd4573c6a5c6a873905ffd4	commit \| diff

Merge branch 'master' into mirceakitsune/universal_reload_system

18 files changed:

qcsrc/server/w_crylink.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_electro.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_fireball.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_grenadelauncher.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hagar.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hlac.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_hook.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_laser.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minelayer.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_minstanex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_nex.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_porto.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_rocketlauncher.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_seeker.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_shotgun.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_sniperrifle.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_tuba.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_uzi.qc	diff1 \|	diff2 \|	blob \| history