Tamito Kajiyama e0df491d1e Merged changes in the trunk up to revision 43404. ...

Conflicts resolved:
source/blender/python/SConscript

2012-01-15 23:13:12 +00:00

..

blender_file_format

pass -noaudio when running blender for various utilities - doc-gen and tests.

2011-10-19 21:55:27 +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

use (const char*) rather than (char*) where possible.

2011-11-05 11:04:28 +00:00

guides

== docs ==

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

license

== docs ==

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

manpage

picky edits & regen man page

2011-12-10 01:07:22 +00:00

python_api

Merged changes in the trunk up to revision 43404.

2012-01-15 23:13:12 +00:00