Tamito Kajiyama 32c7e22d36 Merged changes in the trunk up to revision 37388. ...

Conflicts resolved:
release/scripts/startup/bl_ui/properties_render.py
source/creator/SConscript
source/blender/blenlib/intern/bpath.c
source/blender/editors/space_outliner/outliner.c

2011-06-11 00:22:10 +00:00

build_files

Merged changes in the trunk up to revision 37388.

2011-06-11 00:22:10 +00:00

doc

Merged changes in the trunk up to revision 37388.

2011-06-11 00:22:10 +00:00

extern

update to glew 1.6 from 1.5.8

2011-06-02 00:05:54 +00:00

intern

SVN maintenance.

2011-06-05 00:10:20 +00:00

release

Merged changes in the trunk up to revision 37388.

2011-06-11 00:22:10 +00:00

source

Merged changes in the trunk up to revision 37388.

2011-06-11 00:22:10 +00:00

CMakeLists.txt

cmake: remove python include in the wm module, set opengl as a system include.

2011-06-08 05:39:58 +00:00

COPYING

== docs ==

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

GNUmakefile

avoid cd'ing with the makefile stub

2011-06-06 16:00:32 +00:00

SConstruct

Shuffle some build code around to ensure debug builds on Windows actually run too.

2011-06-08 11:53:07 +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%