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: 177b9cb 5cb34c3)

author	Samual Lenks <samual@xonotic.org>
	Sun, 13 Oct 2013 01:17:08 +0000 (21:17 -0400)
committer	Samual Lenks <samual@xonotic.org>
	Sun, 13 Oct 2013 01:17:08 +0000 (21:17 -0400)
commit	5c4ae3ec7458cf4e8d07f6eed4fe24fceea13b70
tree	e496b7f38871e0c9ae2c9e3ee6c477abde1f1b6f	tree \| snapshot
parent	177b9cbb5146b1f0e0cfba837c3f18bcbc6f7a3d	commit \| diff
parent	5cb34c3cbdcbec9ece2053298a62e87e66d615a1	commit \| diff

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

Conflicts:
qcsrc/server/cl_client.qc

qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/playerstats.qh	diff1 \|	\|	blob \| history
qcsrc/common/util.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/common/util.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/menu/menu.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/defs.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/miscfunctions.qc	diff1 \|	diff2 \|	blob \| history