Benoit Bolsee ca170a8ed6 forgot to resolve one conflict in previous merge

2011-09-09 12:37:56 +00:00

build_files

svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-09 12:21:41 +00:00

doc

svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-09 12:21:41 +00:00

extern

svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-07 15:34:04 +00:00

intern

svn merge -r 37306:39975 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-07 15:34:04 +00:00

release

svn merge -r 39975:40061 https://svn.blender.org/svnroot/bf-blender/trunk/blender

2011-09-09 12:21:41 +00:00

source

forgot to resolve one conflict in previous merge

2011-09-09 12:37:56 +00:00

CMakeLists.txt

patch from Uncle_Entity on IRC for fedora/collada

2011-09-08 03:57:11 +00:00

COPYING

== docs ==

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

GNUmakefile

turns out recent commit made 'make' on its own fail.

2011-08-16 13:45:17 +00:00

SConstruct

ups, syntax error, missing :

2011-08-25 15:18:54 +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%