Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ...

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

2012-11-19 00:41:11 +00:00

build_files

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

doc

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

extern

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

intern

Windows / OSL:

2012-11-18 15:02:09 +00:00

release

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

source

Merged changes in the trunk up to revision 52340.

2012-11-19 00:41:11 +00:00

CMakeLists.txt

CMakeList: Better handling of llvm under linux (now you can try to force usage of a specific version of llvm before using default one).

2012-11-18 17:26:23 +00:00

COPYING

== docs ==

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

GNUmakefile

code cleanup: spelling,

2012-11-12 07:33:01 +00:00

SConstruct

OSX/scons: little cleanup to BF_PROGRAM_LINKFLAGS

2012-11-17 12:09:50 +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%