Tamito Kajiyama a2ebfc82db Merged changes in the trunk up to revision 44797. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/makesdna/DNA_mesh_types.h
source/blender/makesrna/intern/rna_action.c
source/blender/makesrna/intern/rna_ID.c
source/blender/makesrna/intern/rna_mesh.c

2012-03-10 21:56:23 +00:00

..

blender

Merged changes in the trunk up to revision 44797.

2012-03-10 21:56:23 +00:00

blenderplayer

Merged changes in the trunk up to revision 44797.

2012-03-10 21:56:23 +00:00

creator

Merged changes in the trunk up to revision 44797.

2012-03-10 21:56:23 +00:00

darwin

replace former applescript with an editable one

2011-10-19 19:15:35 +00:00

gameengine

style cleanup: consistent names for header guards.

2012-03-09 19:17:19 +00:00

icons

set svn end of lines to native

2011-05-09 08:15:38 +00:00

tests

style cleanup: spelling.

2012-03-09 00:41:09 +00:00

CMakeLists.txt

remove $Id: tags after discussion on the mailign list: http://markmail.org/message/fp7ozcywxum3ar7n

2011-10-23 17:52:20 +00:00

SConscript

Code cleanup: remove source/kernel module, this wasn't really the kernel of

2011-05-06 20:18:42 +00:00