icculus.org git repositories - divverent/darkplaces.git/commit

]> icculus.org git repositories - divverent/darkplaces.git/commit

author	Rudolf Polzer <rpolzer@grawp.div0.qc.to>
	Wed, 17 Feb 2010 07:19:36 +0000 (08:19 +0100)
committer	Rudolf Polzer <rpolzer@grawp.div0.qc.to>
	Wed, 17 Feb 2010 07:19:36 +0000 (08:19 +0100)
commit	a7abf6d9fba9b811c25ce318b852906eec77b2a6
tree	cb91ed04401511b98810ab9c408453c4d3d662ec	tree
parent	0b3ca69fb5fbb82e5f7789fdf98dbf32aaa91364	commit \| diff
parent	a5c12e5524c2af491c483e0207f48524f1cf072a	commit \| diff

Merge branch 'master' into div0/traceboxbox

Conflicts:
clvm_cmds.c
collision.h
model_alias.c
model_brush.c
svvm_cmds.c