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: c974964 59c6397)

author	Jakob MG <jakob_mg@hotmail.com>
	Sat, 14 Jan 2012 09:23:25 +0000 (10:23 +0100)
committer	Jakob MG <jakob_mg@hotmail.com>
	Sat, 14 Jan 2012 09:23:25 +0000 (10:23 +0100)
commit	2d2a167c9d4f4ffd8f4234309c936d99e842869b
tree	2e2d965a7eb766953453b888529ad023a0241013	tree \| snapshot
parent	c9749644cd3944ef5ee0381cf118e76113dd1ba6	commit \| diff
parent	59c6397f642469ec6ed72a83b658644ffa8c4205	commit \| diff

Merge remote-tracking branch 'origin/master' into tzork/gm_nexball

Conflicts:
qcsrc/server/teamplay.qc

defaultXonotic.cfg	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/progs.src	diff1 \|	diff2 \|	blob \| history
qcsrc/server/teamplay.qc	diff1 \|	diff2 \|	blob \| history