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

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 2c02246 2414c63)

author	unknown <samual@xonotic.org>
	Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)
committer	unknown <samual@xonotic.org>
	Mon, 29 Nov 2010 08:07:01 +0000 (03:07 -0500)
commit	5ad3d2aadbd5aa4fe80008df07e1f396ca1c832a
tree	01e789857c268d1c149ae96bd3ae12b72d3218eb	tree \| snapshot
parent	2c022461b9a9a44b84dbf8fd1b8b3063b5160141	commit \| diff
parent	2414c632b73268944cd9072cbf3190e4d926290f	commit \| diff

Merge remote branch 'origin/master' into samual/keepaway

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history