git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit

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

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

summary | shortlog | log | commit | commitdiff | tree
(merge: 094f968 e3c9859)

author	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 14 Dec 2014 01:57:53 +0000 (12:57 +1100)
committer	TimePath <andrew.hardaker1995@gmail.com>
	Sun, 14 Dec 2014 01:57:53 +0000 (12:57 +1100)
commit	dc25d591f448c6ed191fcf9452d65b87d7a26e90
tree	7a3504c860401dacf0b58420899e19490d2cfea4	tree \| snapshot
parent	094f9682a7e8258a383ea9574dc7144eaf7ceecc	commit \| diff
parent	e3c9859a793a28cc209319becdb467b711d761d0	commit \| diff

Merge branch 'master' into TimePath/combined_updates

Conflicts:
qcsrc/common/notifications.qh

defaultXonotic.cfg	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	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/autocvars.qh	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_client.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/cl_player.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/command/vote.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_damage.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/server/g_world.qc	diff1 \|	diff2 \|	blob \| history