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

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

author	Rudolf Polzer <rpolzer@grawp.(none)>
	Thu, 25 Mar 2010 06:43:14 +0000 (07:43 +0100)
committer	Rudolf Polzer <rpolzer@grawp.(none)>
	Thu, 25 Mar 2010 06:43:14 +0000 (07:43 +0100)
commit	0022b1fe08aa536059d7e56e5196f6cc88c5094b
tree	7aa53e4dd126ad059f3570f1c47b66db054fcad1	tree
parent	a7abf6d9fba9b811c25ce318b852906eec77b2a6	commit \| diff
parent	0dbad969a9fb88de32f308d156bbd049cb8ecbf5	commit \| diff

Merge commit 'origin/master' into div0/traceboxbox

Conflicts:
model_brush.c