Tamito Kajiyama efc4341ee4 Merged changes in the trunk up to revision 42556. ...

Conflicts resolved:
source/blender/editors/space_view3d/drawobject.c

2011-12-10 20:54:43 +00:00

..

blender

Merged changes in the trunk up to revision 42556.

2011-12-10 20:54:43 +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

verify existence of dm

2011-12-10 01:00:12 +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