Tamito Kajiyama 65668dc5eb Merged changes in the trunk up to revision 41368. ...

Conflicts resolved:
source/blender/blenkernel/intern/library.c
source/blender/blenlib/intern/bpath.c
source/blender/render/intern/source/convertblender.c

2011-10-30 02:03:40 +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

change doxygen string to 2.59

2011-08-09 07:48:40 +00:00

guides

== docs ==

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

license

== docs ==

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

manpage

update man before ahoy

2011-10-17 14:44:21 +00:00

python_api

Merged changes in the trunk up to revision 41368.

2011-10-30 02:03:40 +00:00