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: 985cbdd b458653)

author	Jakob MG <jakob_mg@hotmail.com>
	Tue, 29 Mar 2011 20:21:30 +0000 (22:21 +0200)
committer	Jakob MG <jakob_mg@hotmail.com>
	Tue, 29 Mar 2011 20:21:30 +0000 (22:21 +0200)
commit	835d73da991f798138916794ebf92a4e1a90c87c
tree	30ee51fd154a645bcb5e36516985130f536e308c	tree \| snapshot
parent	985cbdd00506df68b175f0716c1ab4d590f50224	commit \| diff
parent	b4586534761d8a86de6ec6f842d67d3717b302e9	commit \| diff

Merge master

effectinfo.txt	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/client/projectile.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/progs.src	diff1 \|	diff2 \|	blob \| history