Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478. ... Conflicts resolved: source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c		2012-08-02 00:10:05 +00:00
..
binreloc	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
bullet2	Fixing [#32210] "Character physics type colliding with sensor type" reported by Daniel Stokes (kupoman) by applying a patch found in this Bullet bug report: https://code.google.com/p/bullet/issues/detail?id=525	2012-07-30 03:45:15 +00:00
carve	fix for carve memory leak, update carve to hg bf36d92ff093	2012-07-04 16:07:01 +00:00
colamd	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
Eigen3	Update Eigen3 library, would be needed for some further integraiton.	2012-05-09 08:33:05 +00:00
glew	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
libmv	Merged changes in the trunk up to revision 49478.	2012-08-02 00:10:05 +00:00
libopenjpeg	add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.	2012-06-23 14:23:44 +00:00
libredcode	style cleanup	2012-05-27 00:36:50 +00:00
lzma	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
lzo	update gpl header in cmake files	2012-02-11 04:05:00 +00:00
recastnavigation	code cleanup:	2012-07-29 17:49:14 +00:00
xdnd	Drag-n-drop support on Linux	2012-02-17 16:58:09 +00:00
CMakeLists.txt	add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.	2012-06-23 14:23:44 +00:00
SConscript	XDND support now can be disabled using WITH_GHOST_XDND=OFF with CMake and WITH_GHOST_XDND=False with SCons	2012-02-17 20:51:39 +00:00