Tamito Kajiyama 3197796cf7 Merged changes in the trunk up to revision 42425. ...

Conflicts resolved:
doc/python_api/sphinx_doc_gen.py
source/blender/blenkernel/intern/DerivedMesh.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/mesh/editmesh.c
source/blender/editors/space_view3d/drawobject.c

2011-12-05 02:12:49 +00:00

..

blender

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

blenderplayer

Merged changes in the trunk up to revision 42425.

2011-12-05 02:12:49 +00:00

creator

Merged changes in the trunk up to revision 42116.

2011-11-26 13:11:55 +00:00

darwin

replace former applescript with an editable one

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

gameengine

Slight refactor of VBO code to deal with multiple textures.

2011-12-01 12:12:39 +00:00

icons

set svn end of lines to native

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

tests

Merged changes in the trunk up to revision 42116.

2011-11-26 13:11:55 +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