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

..

binreloc

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

bullet2

add missing files from cmakes lists

2012-09-05 00:52:35 +00:00

carve

correct some include dirs not being included as SYSTEM paths in cmake.

2012-10-02 03:18:48 +00:00

colamd

update gpl header in cmake files

2012-02-11 04:05:00 +00:00

Eigen3

Update to stable Eigen 3.1.1

2012-10-15 16:29:23 +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 51448.

2012-10-20 16:48:48 +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

style cleanup: also spelling

2012-08-24 23:22:34 +00:00

xdnd

Drag-n-drop support on Linux

2012-02-17 16:58:09 +00:00

CMakeLists.txt

Remove old boolean operation module

2012-08-02 16:42:30 +00:00

SConscript

Remove old boolean operation module

2012-08-02 16:42:30 +00:00