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: 24eeef3 1ed620d)

author	Jakob MG <jakob_mg@hotmail.com>
	Thu, 26 May 2011 17:26:56 +0000 (19:26 +0200)
committer	Jakob MG <jakob_mg@hotmail.com>
	Thu, 26 May 2011 17:26:56 +0000 (19:26 +0200)
commit	5be16497ca10373f33c220f727d88439277352ce
tree	45b819677bb03d4d8d49772a138e3ac3cf5900b1	tree \| snapshot
parent	24eeef3b4f9c897ed5cfcdf3753f937e46810ce7	commit \| diff
parent	1ed620d16c68ee54ca7c97688b07932265c343dc	commit \| diff

Merge remote branch 'origin/master' into tzork/vehicles-2

qcsrc/client/Main.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/View.qc	diff1 \|	diff2 \|	blob \| history
qcsrc/client/hud.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