test2

Go to file

Tamito Kajiyama 4ea2fb8b0a Merged changes in the trunk up to revision 49478.

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_scene.c

2012-08-02 00:10:05 +00:00

build_files

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

doc

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

extern

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

intern

Cycles:

2012-08-01 14:56:15 +00:00

release

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

source

Merged changes in the trunk up to revision 49478.

2012-08-02 00:10:05 +00:00

CMakeLists.txt

Update build systems to copy needed dlls from MinGW-w64, turn openmp on by default for MinGW.

2012-07-05 11:39:11 +00:00

COPYING

== docs ==

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

GNUmakefile

More spell checking.

2012-07-04 15:04:38 +00:00

SConstruct

OSX/scons: fix compiling on the new OSX 10.8 (Mountain Lion) with delivered Xcode 4.4

2012-07-26 11:08:56 +00:00

Languages

C++ 78%

Python 14.9%

C 2.9%

GLSL 1.9%

CMake 1.2%

Other 0.9%