Tamito Kajiyama 4c36a26af5 Merged changes in the trunk up to revision 45308. ...

Conflicts resolved:
source/blender/editors/interface/resources.c
source/blender/editors/mesh/editmesh_select.c
source/blender/editors/space_view3d/drawobject.c

2012-03-31 22:09:43 +00:00

..

blender

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

blenderplayer

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

creator

Merged changes in the trunk up to revision 45308.

2012-03-31 22:09:43 +00:00

darwin

replace former applescript with an editable one

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

gameengine

move debug flag into its own global var (G.debug), split up debug options.

2012-03-31 00:59:17 +00:00

icons

set svn end of lines to native

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

tests

spelling cleanup

2012-03-18 07:38:51 +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