Tamito Kajiyama 329b05dcd7 Merged changes in the trunk up to revision 47381. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c

2012-06-03 21:11:10 +00:00

build_files

Merged changes in the trunk up to revision 47381.

2012-06-03 21:11:10 +00:00

doc

Merged changes in the trunk up to revision 47056.

2012-05-26 22:22:45 +00:00

extern

BGE patch #28476: Character object physics type

2012-05-28 21:36:29 +00:00

intern

Cycles / OSL:

2012-06-03 18:04:52 +00:00

release

Merged changes in the trunk up to revision 47381.

2012-06-03 21:11:10 +00:00

source

Merged changes in the trunk up to revision 47381.

2012-06-03 21:11:10 +00:00

CMakeLists.txt

reenable sm13 for win32 cmake

2012-05-29 16:18:10 +00:00

COPYING

== docs ==

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

GNUmakefile

cmake edits

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

SConstruct

Scons:

2012-05-29 12:13:45 +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%