Tamito Kajiyama 003ab20292 Merged changes in the trunk up to revision 35618. ...

Conflicts resolved:
source/blender/makesrna/RNA_types.h
source/blender/makesrna/intern/rna_main_api.c

2011-03-19 00:05:30 +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

doxygen

Cleanup paths after move to dir.

2011-02-28 09:58:53 +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 35618.

2011-03-19 00:05:30 +00:00