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: ff656ea 70c8c59)

author	Rudolf Polzer <divverent@alientrap.org>
	Sat, 8 May 2010 18:43:45 +0000 (20:43 +0200)
committer	Rudolf Polzer <divverent@alientrap.org>
	Sat, 8 May 2010 18:43:45 +0000 (20:43 +0200)
commit	58b26c0a303456441dbb82e608213d2f86d695d8
tree	88997036770be052de312ee95ca00f078c2ba2e9	tree \| snapshot
parent	ff656ea086d14c75baf49e2365f12a0cd8592715	commit \| diff
parent	70c8c5954262fc62dee11d9f5f463b9996f544d7	commit \| diff

Merge commit 'origin/master' into divVerent/tag_seeker

balance.cfg	diff1 \|	diff2 \|	blob \| history
balance25.cfg	diff1 \|	diff2 \|	blob \| history
balanceSamual.cfg	diff1 \|	diff2 \|	blob \| history
balanceXPM.cfg	\|	diff2 \|	blob \| history
defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/constants.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/t_items.qc	diff1 \|	diff2 \|	blob \| history