Tamito Kajiyama 66a2b84897 Merged changes in the trunk up to revision 54992. ...

Resolved conflicts:
release/scripts/startup/bl_ui/space_view3d.py

2013-03-03 15:07:49 +00:00

..

binreloc

update gpl header in cmake files

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

bullet2

add missing bullet header to cmake, quiet reports from 'make test_cmake'

2013-02-06 04:16:28 +00:00

carve

Update Carve to newest upstream version with some assorted fixes

2013-02-25 10:02:43 +00:00

colamd

update gpl header in cmake files

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

Eigen3

Merging r50625 through r51896 from trunk into soc-2011-tomato

2012-11-05 19:42:27 +00:00

glew

Merging r51923 through r52851 from trunk into soc-2011-tomato

2012-12-10 15:18:00 +00:00

libmv

Merged changes in the trunk up to revision 54992.

2013-03-03 15:07:49 +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 bundled version of minilzo

2013-02-25 08:16:28 +00:00

rangetree

Import the RangeTree library into extern

2012-12-30 18:20:52 +00:00

recastnavigation

Merging r50625 through r51896 from trunk into soc-2011-tomato

2012-11-05 19:42:27 +00:00

xdnd

Merging r51923 through r52851 from trunk into soc-2011-tomato

2012-12-10 15:18:00 +00:00

CMakeLists.txt

add option WITH_SYSTEM_BULLET to link against the bullet installation found on the system.

2013-01-03 00:23:52 +00:00

SConscript

Import the RangeTree library into extern

2012-12-30 18:20:52 +00:00