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: 385f53e e55b0af)

author	Samual <samual@xonotic.org>
	Thu, 24 May 2012 16:09:09 +0000 (12:09 -0400)
committer	Samual <samual@xonotic.org>
	Thu, 24 May 2012 16:09:09 +0000 (12:09 -0400)
commit	cfdec7de4f6fff90a2142be820eaeb43a5f7f572
tree	ac8b57d0632601d55a538bf92a41506b8f90315f	tree \| snapshot
parent	385f53e7ad57423222659adc7d8e5e30489f8880	commit \| diff
parent	e55b0af41ff296efc886dfaccf3f663f751f6502	commit \| diff

Merge remote-tracking branch 'origin/master' into samual/spawn_weapons

Conflicts:
effectinfo.txt
qcsrc/common/util.qc
qcsrc/common/util.qh

balanceXonotic.cfg	diff1 \|	diff2 \|	blob \| history
effectinfo.txt	diff1 \|	diff2 \|	blob \| history
qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/w_common.qc	diff1 \|	diff2 \|	blob \| history