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_file_format

== blender file format ==

2010-11-01 13:27:33 +00:00

build_systems

remove nan-makefiles

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

guides

== docs ==

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

license

== docs ==

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

manpage

option for blender --addons rigify,io_scene_fbx,add_mesh_gears

2011-01-26 16:30:12 +00:00

python_api

Merged changes in the trunk up to revision 34996.

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

Doxyfile

doxygen: add blenlib under core as module.

2011-02-18 13:58:08 +00:00

doxygen.main

doxygen: blenkernel under core as module.

2011-02-18 13:05:18 +00:00