This repository has been archived on 2023-10-09. You can view files and clone it. You cannot open issues or pull requests or push a commit.

Tamito Kajiyama 76a211d809 Merged changes in the trunk up to revision 43219. ...

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

2012-01-08 11:57:53 +00:00

..

blender

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

blenderplayer

Merged changes in the trunk up to revision 43038.

2011-12-31 21:09:26 +00:00

creator

Merged changes in the trunk up to revision 43219.

2012-01-08 11:57:53 +00:00

darwin

replace former applescript with an editable one

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

gameengine

more edits to r43145,

2012-01-05 06:34:14 +00:00

icons

set svn end of lines to native

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

tests

patch [#29534] Change Matrix Representation and Access in Python to Conform with Standard Notation

2011-12-22 01:05:03 +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

…