Tamito Kajiyama 1fe70c07a0 Merged changes in the trunk up to revision 51126. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/windowmanager/WM_types.h

2012-10-06 23:32:21 +00:00

build_files

Merged changes in the trunk up to revision 51126.

2012-10-06 23:32:21 +00:00

doc

Merged changes in the trunk up to revision 51126.

2012-10-06 23:32:21 +00:00

extern

Merged changes in the trunk up to revision 51126.

2012-10-06 23:32:21 +00:00

intern

Avoid unecessary minimizer calculations in dualcon

2012-10-06 18:28:38 +00:00

release

Merged changes in the trunk up to revision 51126.

2012-10-06 23:32:21 +00:00

source

Merged changes in the trunk up to revision 51126.

2012-10-06 23:32:21 +00:00

CMakeLists.txt

Force USE_QTKIT for osx 64bit

2012-10-06 18:53:57 +00:00

COPYING

== docs ==

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

GNUmakefile

added simple checker for array sizes, uses clang to parse C/C++,

2012-10-06 12:36:21 +00:00

SConstruct

Enable OpenColorIO for MinGW64 build targets

2012-09-16 18:05:32 +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%