Public Git Hosting - plumiferos.git/commit

commit	0946a8d36b3d68b83c1e8acf3135eca2fc8ecb75
author	Diego Hernan Borghetti <bdiego@gmail.com>
	Fri, 22 Feb 2008 16:31:40 +0000 (22 13:31 -0300)
committer	Diego Hernan Borghetti <bdiego@gmail.com>
	Fri, 22 Feb 2008 16:31:40 +0000 (22 13:31 -0300)
tree	e0edf9449877bab61b006849c7ab16573b6427b6	tree \| snapshot (tar.gz zip)
parent	5a74d0b70d2e72f065dd6169c02177f17fd41af3	commit \| diff
parent	9873633a5f5a234faa0a572051f8eb7820f0b0e8	commit \| diff

Merge branch 'me/qmc'

Conflicts:

source/blender/blenkernel/BKE_blender.h
source/blender/blenloader/intern/readfile.c

Diego's blender repository

source/blender/blenkernel/BKE_blender.h	diff1 \|	diff2 \|	blob \| history
source/blender/blenkernel/intern/colortools.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenlib/intern/arithb.c	diff1 \|	diff2 \|	blob \| history
source/blender/blenloader/intern/readfile.c	diff1 \|	diff2 \|	blob \| history
source/blender/render/intern/source/shadeoutput.c	diff1 \|	diff2 \|	blob \| history
source/blender/src/interface_draw.c	diff1 \|	diff2 \|	blob \| history