Tamito Kajiyama 55015daa43 Merged changes in the trunk up to revision 51448. ... Conflicts resolved: source/blender/blenkernel/CMakeLists.txt source/blender/blenloader/intern/readfile.c source/blender/editors/mesh/editmesh_tools.c source/blender/makesrna/intern/rna_main_api.c		2012-10-20 16:48:48 +00:00
..
buildbot	style cleanup: pep8	2012-10-08 10:03:01 +00:00
cmake	style cleanup: make OSL follow our C style convention. http://wiki.blender.org/index.php/Dev:Doc/CodeStyle	2012-10-17 01:47:37 +00:00
package_spec	Have CPack rpm builder install the colorspace folder too	2012-10-04 15:14:15 +00:00
scons	Merged changes in the trunk up to revision 50956.	2012-09-30 13:16:55 +00:00