Tamito Kajiyama 040f0a1096 Merged changes in the trunk up to revision 35828. ...

Conflicts resolved:
source/blender/makesrna/RNA_enum_types.h

According to the changes in revision 35667, the Freestyle-related code
in release/scripts/ui/ was moved to release/scripts/startup/bl_ui/.

2011-03-27 23:11:22 +00:00

build_files

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

doc

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

extern

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

intern

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

release

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

source

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

CMakeLists.txt

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

COPYING

== docs ==

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

GNUmakefile

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +00:00

SConstruct

Merged changes in the trunk up to revision 35828.

2011-03-27 23:11:22 +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%