Tamito Kajiyama 9ca7f6659f Merged changes in the trunk up to revision 44419. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_view3d/drawobject.c
source/creator/CMakeLists.txt

2012-02-25 01:26:45 +00:00

..

blender_file_format

Code Cleanup: check is / is not when comparing singletons.

2012-02-02 21:07:56 +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 44419.

2012-02-25 01:26:45 +00:00