Tamito Kajiyama e91f33101f Merged changes in the trunk up to revision 50956. ...

Conflicts resolved:
source/blender/editors/interface/resources.c

2012-09-30 13:16:55 +00:00

build_files

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +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 50829.

2012-09-23 18:50:56 +00:00

intern

Cycles UI Tweak:

2012-09-29 23:45:35 +00:00

release

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +00:00

source

Merged changes in the trunk up to revision 50956.

2012-09-30 13:16:55 +00:00

CMakeLists.txt

code cleanup: correct spelling

2012-09-28 06:45:20 +00:00

COPYING

…

GNUmakefile

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

SConstruct

Merged changes in the trunk up to revision 50829.

2012-09-23 18:50:56 +00:00

Description

No description provided

926 MiB

Languages

C++ 78.1%

Python 15%

C 2.8%

GLSL 1.8%

CMake 1.2%

Other 0.9%