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: 59c257e e2daf8d)

author	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Tue, 10 May 2011 23:20:14 +0000 (02:20 +0300)
committer	Mircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
	Tue, 10 May 2011 23:20:14 +0000 (02:20 +0300)
commit	5d7727e34f57b35e91f5213eff03cc958ca618d0
tree	b3a5d46d5ee35a0b8edc019babf66dca0cc860c4	tree \| snapshot
parent	59c257eff12dbe51d08f3913b8c73102e3478a6e	commit \| diff
parent	e2daf8d138855a357293af335c1406ac2f808870	commit \| diff

Merge branch 'master' into mirceakitsune/weapon_hagar_secondary_load

14 files changed:

balance25.cfg	diff1 \|	diff2 \|	blob \| history
balanceLeeStricklin.cfg	diff1 \|	diff2 \|	blob \| history
balanceSamual.cfg	diff1 \|	diff2 \|	blob \| history
balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
balancetZork.cfg	diff1 \|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_weaponsystem.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
xonotic-credits.txt	diff1 \|	diff2 \|	blob \| history