Tamito Kajiyama 70aa63306a Merged changes in the trunk up to revision 34996. ...

Conflicts resolved:
C:\bf-blender\soc-2008-mxcurioni\doc\python_api\sphinx_doc_gen.py
C:\bf-blender\soc-2008-mxcurioni\source\blender\makesrna\RNA_types.h
C:\bf-blender\soc-2008-mxcurioni\source\blender\render\SConscript

2011-02-19 23:51:18 +00:00

..

blender

Merged changes in the trunk up to revision 34996.

2011-02-19 23:51:18 +00:00

blenderplayer

...and for blenderplayer

2011-02-15 12:43:34 +00:00

creator

Merged changes in the trunk up to revision 34996.

2011-02-19 23:51:18 +00:00

darwin

remove nan-makefiles

2011-01-30 15:29:22 +00:00

gameengine

Remove header include, conflicts otherwise with BLI_math.h

2011-02-18 14:30:36 +00:00

icons

remove nan-makefiles

2011-01-30 15:29:22 +00:00

kernel

remove nan-makefiles

2011-01-30 15:29:22 +00:00

tests

bugfix [#26094] Going to Bone Roll menu brings up python error

2011-02-16 02:25:03 +00:00

CMakeLists.txt

- fix problem with cmake, windows 'RelWithDebInfo' target, was giving error: "ImportError: No module named _socket" because of copying wrong files over.

2011-01-23 11:42:29 +00:00

SConscript

dont build blender/kernel if the game engines disabled.

2010-10-31 00:56:46 +00:00