Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. ... Conflicts resolved: source/blender/blenkernel/BKE_main.h source/blender/blenkernel/CMakeLists.txt source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/interface/resources.c source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_action_types.h source/blender/makesdna/intern/makesdna.c source/blender/makesrna/SConscript source/blender/makesrna/intern/rna_internal.h source/blender/makesrna/intern/rna_main.c source/blender/makesrna/intern/rna_main_api.c source/blender/windowmanager/WM_types.h		2012-06-10 20:50:43 +00:00
..
buildbot	Enable cuda sm_30 kernels for buildbot	2012-06-05 19:23:52 +00:00
cmake	code cleanup: remove mode comments, these were applied very un-evenly across a few files.	2012-05-27 13:22:43 +00:00
package_spec	CPack rpm cleanup	2012-05-16 02:51:58 +00:00
scons	Merged changes in the trunk up to revision 47381.	2012-06-03 21:11:10 +00:00