Tamito Kajiyama 4172997675 Merged changes in the trunk up to revision 50607. ...

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

2012-09-15 00:15:24 +00:00

build_files

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

doc

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

extern

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

intern

style cleanup

2012-09-14 23:11:47 +00:00

release

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

source

Merged changes in the trunk up to revision 50607.

2012-09-15 00:15:24 +00:00

CMakeLists.txt

Disable legacy compositor by default

2012-09-14 15:21:56 +00:00

COPYING

== docs ==

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

GNUmakefile

add checking target check_smatch

2012-09-14 05:08:48 +00:00

SConstruct

add back datatoc, use this instead of cmake script which was too slow.

2012-08-11 16:25:31 +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%