Tamito Kajiyama 55015daa43 Merged changes in the trunk up to revision 51448. ...

Conflicts resolved:
source/blender/blenkernel/CMakeLists.txt
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh_tools.c
source/blender/makesrna/intern/rna_main_api.c

2012-10-20 16:48:48 +00:00

..

blender_file_format

replace python3 command with python3.2, python3 isnt available on ubuntu.

2012-05-01 20:45:16 +00:00

build_systems

Spellfixes: colour -> color

2012-07-04 12:19:50 +00:00

doxygen

move bmesh wiki docs into bmesh header and update doxygen.

2012-02-27 20:27:19 +00:00

guides

patch [#32791] Spelling mistakes corrected.

2012-10-07 03:26:30 +00:00

license

== docs ==

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

manpage

style cleanup: comment blocks

2012-10-04 13:26:15 +00:00

python_api

Merged changes in the trunk up to revision 51448.

2012-10-20 16:48:48 +00:00