Tamito Kajiyama 2676f2d58f Merged changes in the trunk up to revision 42021. ...

Conflicts resolved:
source/blender/blenkernel/intern/scene.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/interface/resources.c
source/blender/render/intern/source/pipeline.c

2011-11-20 21:02:12 +00:00

..

blender

Merged changes in the trunk up to revision 42021.

2011-11-20 21:02:12 +00:00

blenderplayer

Merged changes in the trunk up to revision 42021.

2011-11-20 21:02:12 +00:00

creator

Merged changes in the trunk up to revision 42021.

2011-11-20 21:02:12 +00:00

darwin

replace former applescript with an editable one

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

gameengine

Merged changes in the trunk up to revision 42021.

2011-11-20 21:02:12 +00:00

icons

set svn end of lines to native

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

tests

hide overly picky warnings from 'pylint' for pep8 script, indentation edits.

2011-11-19 16:17:35 +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