Ove Murberg Henriksen 4ace1fbbcc svn merge ^/trunk/blender -r46335:46340 ...

1 tree conflict. Resolved:
	I deleted source/tools/GL. 
	Then I checked out folder from trunk (revision 46340)
	Then I ran: resolve --accept working source/tools/GL

2012-05-07 23:23:55 +00:00

build_files

Fix: recent commit setting python3.2 command should not be applied to this file

2012-05-02 09:03:04 +00:00

doc

svn merge ^/trunk/blender -r46100:46200

2012-05-06 23:06:24 +00:00

extern

svn merge ^/trunk/blender -r46335:46340

2012-05-07 23:23:55 +00:00

intern

svn merge ^/trunk/blender -r46300:46330

2012-05-07 01:04:52 +00:00

release

svn merge ^/trunk/blender -r46335:46340

2012-05-07 23:23:55 +00:00

source

svn merge ^/trunk/blender -r46335:46340

2012-05-07 23:23:55 +00:00

CMakeLists.txt

code cleanup: BKE_scene api naming.

2012-05-05 14:33:36 +00:00

COPYING

== docs ==

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

GNUmakefile

replace python3 command with python3.2, python3 isnt available on ubuntu.

2012-05-01 20:45:16 +00:00

SConstruct

Add pthread dll for MinGW64 during installation. Now people who download from buildbot will be able to run the build even without MinGW-w64 installed.

2012-05-01 20:57:39 +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%