Tamito Kajiyama bb1f8d9586 Merged changes in the trunk up to revision 46309. ...

Conflicts resolved:
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_tools.c

2012-05-05 11:40:42 +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

Remove some more $Id$ that still were left after r41227 and r41228.

2011-10-23 19:01:59 +00:00

doxygen

move bmesh wiki docs into bmesh header and update doxygen.

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

guides

== docs ==

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

license

== docs ==

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

manpage

Release commit, 2.63!

2012-04-26 17:49:48 +00:00

python_api

Merged changes in the trunk up to revision 46309.

2012-05-05 11:40:42 +00:00