Campbell Barton 57a57c4e39 svn merge ^/trunk/blender -r48276:48283

2012-06-25 18:03:19 +00:00

build_files

Merging r48196 through r48223 from trunk into soc-2011-tomato

2012-06-23 18:08:56 +00:00

doc

style cleanup

2012-06-25 07:24:48 +00:00

extern

add cmake option WITH_SYSTEM_OPENJPEG so linux can build cycles without having libopenjpeg installed.

2012-06-23 14:23:44 +00:00

intern

Merging r48264 through r48276 from trunk into soc-2011-tomato

2012-06-25 16:37:58 +00:00

release

svn merge ^/trunk/blender -r48245:48254

2012-06-25 07:41:01 +00:00

source

svn merge ^/trunk/blender -r48276:48283

2012-06-25 18:03:19 +00:00

CMakeLists.txt

Merging r48257 through r48263 from trunk into soc-2011-tomato

2012-06-25 10:56:48 +00:00

COPYING

== docs ==

2010-10-13 14:44:22 +00:00

GNUmakefile

cmake edits

2012-05-27 10:03:13 +00:00

SConstruct

svn merge ^/trunk/blender -r48153:48158

2012-06-21 12:29:48 +00:00

Description

No description provided

841 MiB

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%